]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commit173368d73da792663358dea5b878cc822511001e
tree8435a23264c4ed38b5172ff401b15905294cd9c2tree
parent6c083b7619f171d32df633ca0281653afabd788fcommit | diff
parentf172556b89822693cae70f87c73fe7b6a96b9855commit | diff
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
sequencer.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.