]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'jc/revert-show-parent-info'
authorJunio C Hamano <gitster@pobox.com>
Wed, 15 Jun 2022 22:09:27 +0000 (15:09 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 15 Jun 2022 22:09:27 +0000 (15:09 -0700)
"git revert" learns "--reference" option to use more human-readable
reference to the commit it reverts in the message template it
prepares for the user.

* jc/revert-show-parent-info:
  revert: --reference should apply only to 'revert', not 'cherry-pick'
  revert: optionally refer to commit in the "reference" format

1  2 
sequencer.c
t/t3501-revert-cherry-pick.sh

diff --cc sequencer.c
Simple merge
Simple merge