Code

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)
commit541b9cf1463334b1984a0b78a7180246415cb477
treedca0ebe9f75365e4b35ea44488dca0010afd0496
parent2201cc8c977918c520e70093f4b74bbdf70afcc5
parent278f7e6f6dc1b515f192daf836fe75d733435774
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
builtin/revert.c