[openwrt/openwrt] scripts/kernel_bump: Delete merge commit

[LEDE Commits]

robimarko pushed a commit to openwrt/openwrt.git, branch main:
https://git.openwrt.org/98235e60ed8436ca9476c3bc84a8f1feb553a764

commit 98235e60ed8436ca9476c3bc84a8f1feb553a764
Author: Olliver Schinagl <oliver at schinagl.nl>
AuthorDate: Mon Mar 18 14:03:59 2024 +0100

    scripts/kernel_bump: Delete merge commit
    
    While we have included the needed changes via a merge commit, there is
    no need to keep it. Lets drop the merge commit, which we can do as we
    haven't pushed anything.
    
    Signed-off-by: Olliver Schinagl <oliver at schinagl.nl>
---
 scripts/kernel_bump.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/scripts/kernel_bump.sh b/scripts/kernel_bump.sh
index 1a6e5e5ea7..0a123ea95a 100755
--- a/scripts/kernel_bump.sh
+++ b/scripts/kernel_bump.sh
@@ -171,6 +171,8 @@ bump_kernel()
 	git switch "${initial_branch:?Unable to switch back to original branch. Quitting.}"
 	GIT_EDITOR=true git merge --no-ff '__openwrt_kernel_files_mover'
 	git branch --delete '__openwrt_kernel_files_mover'
+	echo "Deleting merge commit ($(git rev-parse HEAD))."
+	git rebase HEAD~1
 
 	echo "Original commitish was '${initial_commitish}'."
 	echo 'Kernel bump complete. Remember to use `git log --follow`.'