| commit | 278f7e6f6dc1b515f192daf836fe75d733435774 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 7 Oct 2011 00:02:11 +0000 (6 17:02 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 7 Oct 2011 00:02:11 +0000 (6 17:02 -0700) | ||
| tree | 8e8f5b613e47929f4e44d8c963bfa34ff4b026a6 | treesnapshot (tar.gz zip) |
| parent | 7f41b6bbe3181dc4d1687db036bf22316997a1bf | commitdiff |
| parent | 82352cb633f30fef9dd837235c328890da12930e | commitdiff |
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
* 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 | blobhistory |