]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 09e0aa6 e4301f7)
Merge branch 'vn/rebase-with-cherry-pick-authorship'
authorJunio C Hamano <gitster@pobox.com>
Wed, 14 Feb 2024 23:36:05 +0000 (15:36 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 14 Feb 2024 23:36:05 +0000 (15:36 -0800)
"git cherry-pick" invoked during "git rebase -i" session lost
the authorship information, which has been corrected.

* vn/rebase-with-cherry-pick-authorship:
  sequencer: unset GIT_CHERRY_PICK_HELP for 'exec' commands

1  2 
sequencer.c patch | diff1 | diff2 | blob | history
t/t3404-rebase-interactive.sh patch | diff1 | diff2 | blob | history

diff --cc sequencer.c
Simple merge
diff --cc t/t3404-rebase-interactive.sh
Simple merge
Unnamed repository; edit this file 'description' to name the repository.