]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2201cc8 278f7e6)
Merge branch 'js/no-cherry-pick-head-after-punted'
authorJunio C Hamano <gitster@pobox.com>
Wed, 19 Oct 2011 17:49:05 +0000 (10:49 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 19 Oct 2011 17:49:05 +0000 (10:49 -0700)
* js/no-cherry-pick-head-after-punted:
  cherry-pick: do not give irrelevant advice when cherry-pick punted
  revert.c: defer writing CHERRY_PICK_HEAD till it is safe to do so

1  2 
builtin/revert.c patch | diff1 | diff2 | blob | history

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