From: Junio C Hamano Date: Wed, 19 Oct 2011 17:49:05 +0000 (-0700) Subject: Merge branch 'js/no-cherry-pick-head-after-punted' X-Git-Tag: v1.7.8-rc0~39 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=541b9cf1463334b1984a0b78a7180246415cb477;p=git.git 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 --- 541b9cf1463334b1984a0b78a7180246415cb477