]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6c083b7 f172556)
Merge branch 'zh/cherry-pick-advice'
authorJunio C Hamano <gitster@pobox.com>
Fri, 10 Sep 2021 18:46:19 +0000 (11:46 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 10 Sep 2021 18:46:19 +0000 (11:46 -0700)
The advice message that "git cherry-pick" gives when it asks
conflicted replay of a commit to be resolved by the end user has
been updated.

* zh/cherry-pick-advice:
  cherry-pick: use better advice message

1  2 
sequencer.c patch | diff1 | diff2 | blob | history

diff --cc sequencer.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.