diff options
| author | Olliver Schinagl <oliver@schinagl.nl> | 2024-03-18 14:03:59 +0100 |
|---|---|---|
| committer | Robert Marko <robimarko@gmail.com> | 2024-04-12 18:20:53 +0200 |
| commit | 98235e60ed8436ca9476c3bc84a8f1feb553a764 (patch) | |
| tree | d933c53cf5732bcc37d88be8d4b9f84724c54c8d /scripts | |
| parent | 71c663bcfd6e7839ef3a21482ee939bc0b1ff65c (diff) | |
| download | openwrt-98235e60ed8436ca9476c3bc84a8f1feb553a764.tar.gz openwrt-98235e60ed8436ca9476c3bc84a8f1feb553a764.tar.bz2 openwrt-98235e60ed8436ca9476c3bc84a8f1feb553a764.zip | |
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@schinagl.nl>
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/kernel_bump.sh | 2 |
1 files changed, 2 insertions, 0 deletions
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`.' |