![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 19 Oct 2011 17:49:05 +0000 (10:49 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 19 Oct 2011 17:49:05 +0000 (10:49 -0700) | ||
| commit | 541b9cf1463334b1984a0b78a7180246415cb477 | |
| tree | dca0ebe9f75365e4b35ea44488dca0010afd0496 | tree | snapshot |
| parent | 2201cc8c977918c520e70093f4b74bbdf70afcc5 | commit | diff |
| parent | 278f7e6f6dc1b515f192daf836fe75d733435774 | commit | diff |
Merge branch 'js/no-cherry-pick-head-after-punted'
* 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
* 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
| builtin/revert.c | diff1 | | diff2 | | blob | history |