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

Junio C Hamano committed Oct 19, 2011 at 10:49 UTC 541b9cf1463334b1984a0b78a7180246415cb477

No changes.