| commit | 173368d73da792663358dea5b878cc822511001e | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 10 Sep 2021 18:46:19 +0000 (10 11:46 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 10 Sep 2021 18:46:19 +0000 (10 11:46 -0700) | ||
| tree | 8435a23264c4ed38b5172ff401b15905294cd9c2 | treesnapshot (tar.gz zip) |
| parent | 6c083b7619f171d32df633ca0281653afabd788f | commitdiff |
| parent | f172556b89822693cae70f87c73fe7b6a96b9855 | commitdiff |
Merge branch 'zh/cherry-pick-advice'
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
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
| sequencer.c | diff1 | diff2 | blobhistory |