Hi, My configuration: OS Kubuntu 24.04 Git version: 2.54.0 from ppa:git-core/ppa
.gitconfig
[merge]
guitool = meld
tool = meld
[core]
editor = code -w
autocrlf = input
quotePath = false
eol = lf[global]
[diff]
tool = meld
[gui]
editor = code
[fetch]
prune = true
[mergetool]
keepBackup = falseHow to reproduce: 1) Made repo # Init repo with README.md git init echo -e '# Git rebase bug\n\n```\ngit rebase master\ngit mergetool\ngit rebase --continue\ngit rev-parse REBASE_HEAD\n```' > README.md git add README.md git commit -m "docs: add README.md"
# Add feature branch git branch feature_branch
# Add files in separate commits echo -e "Text 1 line\nText 2 line\nText 3 line\nText 4 line\nText 5 line" > Text1.txt git add Text1.txt git commit -m "feat: add Text1.txt"
echo -e "Text 1 line\nText 2 line\nText 3 line\nText 4 line\nText 5 line" > Text2.txt git add Text2.txt git commit -m "feat: add Text2.txt"
echo -e "Text 1 line\nText 2 line\nText 3 line\nText 4 line\nText 5 line" > Text3.txt git add Text3.txt git commit -m "feat: add Text3.txt"
# Do the same in feature branch and one more in one commit git checkout feature_branch echo -e "Texts 1 line\nTexts 2 line\nTexts 3 line\nText 4 line\nTexts 5 line" > Text1.txt git add Text1.txt
echo -e "Text 1 line\nText 2 line\nText 3 line\nText 4 line\nText 5 line" > Text2.txt git add Text2.txt
echo -e "Texts 1 line\nTexts 2 line\nTexts 3 line\nText 4 line\nTexts 5 line" > Text3.txt git add Text3.txt
echo -e "Texts 1 line\nTexts 2 line\nText 3 line\nTexts 4 line\nText 5 line" > Text4.txt git add Text4.txt git commit -m "feat: add all files" 2) Call — git rebase master 3) Call — git mergetool 4) Call — git rebase --continue 5) Call — git rev-parse REBASE_HEAD Last command return value and .git/REBASE_HEAD exists. In other words REBASE_HEAD exists if ogirinal commit in new branch modified and need call git push --force to send it to server. Please fix it, thanks!
-- Long76