From e7909fd0fa46a2a5696f88f08e7ba054eb25da09 Mon Sep 17 00:00:00 2001
From: David Taylor <tinystatemachine@gmail.com>
Date: Wed, 20 Dec 2023 17:56:40 +0000
Subject: [PATCH 1/3] scripts/bump-pebble: use --no-merges instead of grep

Release note: none.
Epic: none.
---
 scripts/bump-pebble.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/scripts/bump-pebble.sh b/scripts/bump-pebble.sh
index cedf25e3cf1e..b2a1fc1083f4 100755
--- a/scripts/bump-pebble.sh
+++ b/scripts/bump-pebble.sh
@@ -64,8 +64,7 @@ if ! git merge-base --is-ancestor $OLD_SHA $NEW_SHA; then
   exit 1
 fi
 
-COMMITS=$(git log --pretty='format:%h %s' "$OLD_SHA..$NEW_SHA" |
-          grep -v 'Merge pull request' |
+COMMITS=$(git log --no-merges --pretty='format:%h %s' "$OLD_SHA..$NEW_SHA" |
           sed 's#^#https://github.com/cockroachdb/pebble/commit/#')
 popd
 

From c66362cd2d2dbdf862920eff2367dffd0ea926f0 Mon Sep 17 00:00:00 2001
From: David Taylor <tinystatemachine@gmail.com>
Date: Wed, 20 Dec 2023 18:02:03 +0000
Subject: [PATCH 2/3] scripts/bump-pebble: add Epic: none.

Release note: none.
Epic: none.
---
 scripts/bump-pebble.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/scripts/bump-pebble.sh b/scripts/bump-pebble.sh
index b2a1fc1083f4..bdff9c5ea91e 100755
--- a/scripts/bump-pebble.sh
+++ b/scripts/bump-pebble.sh
@@ -95,7 +95,8 @@ git commit -m "go.mod: bump Pebble to ${NEW_SHA:0:12}
 
 $COMMITS
 
-Release note:
+Release note: none.
+Epic: none.
 "
 # Open an editor to allow the user to set the release note.
 git commit --amend

From ca71eb91abf097a833f5bd98ad8fd30468cf6ac9 Mon Sep 17 00:00:00 2001
From: David Taylor <tinystatemachine@gmail.com>
Date: Wed, 20 Dec 2023 17:58:04 +0000
Subject: [PATCH 3/3] scripts/bump-pebble: markdown format commit links

Release note: none.
Epic: none.
---
 scripts/bump-pebble.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/scripts/bump-pebble.sh b/scripts/bump-pebble.sh
index bdff9c5ea91e..b357431ce9d4 100755
--- a/scripts/bump-pebble.sh
+++ b/scripts/bump-pebble.sh
@@ -64,8 +64,7 @@ if ! git merge-base --is-ancestor $OLD_SHA $NEW_SHA; then
   exit 1
 fi
 
-COMMITS=$(git log --no-merges --pretty='format:%h %s' "$OLD_SHA..$NEW_SHA" |
-          sed 's#^#https://github.com/cockroachdb/pebble/commit/#')
+COMMITS=$(git log --no-merges --pretty='format: * [`%h`](https://github.com/cockroachdb/pebble/commit/%h) %s' "$OLD_SHA..$NEW_SHA")
 popd
 
 echo
@@ -93,6 +92,8 @@ go mod tidy
 git add go.mod go.sum DEPS.bzl build/bazelutil/distdir_files.bzl
 git commit -m "go.mod: bump Pebble to ${NEW_SHA:0:12}
 
+Changes:
+
 $COMMITS
 
 Release note: none.