]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 7f41b6b 82352cb)
Merge branch 'js/maint-no-cherry-pick-head-after-punted' into js/no-cherry-pick-head...
authorJunio C Hamano <gitster@pobox.com>
Fri, 7 Oct 2011 00:02:11 +0000 (17:02 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 7 Oct 2011 00:02:11 +0000 (17:02 -0700)
commit278f7e6f6dc1b515f192daf836fe75d733435774
tree8e8f5b613e47929f4e44d8c963bfa34ff4b026a6tree | snapshot
parent7f41b6bbe3181dc4d1687db036bf22316997a1bfcommit | diff
parent82352cb633f30fef9dd837235c328890da12930ecommit | diff
Merge branch 'js/maint-no-cherry-pick-head-after-punted' into js/no-cherry-pick-head-after-punted

* js/maint-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

Conflicts:
builtin/revert.c
builtin/revert.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.