On Fri, Mar 30, 2012 at 03:48:39PM -0400, Neil Horman wrote: > git cherry-pick fails when picking a non-ff commit that is empty. The advice > given with the failure is that a git-commit --allow-empty should be issued to > explicitly add the empty commit during the cherry pick. This option allows a > user to specify before hand that they want to keep the empty commit. This > eliminates the need to issue both a cherry pick and a commit operaion. > > Signed-off-by: Neil Horman <nhorman@xxxxxxxxxxxxx> > CC: Jeff King <peff@xxxxxxxx> > CC: Phil Hord <phil.hord@xxxxxxxxx> > CC: Junio C Hamano <gitster@xxxxxxxxx> As you and Jeff noted, I can certainly change keep-empty to allow-empty, both here and in the rebase command. I'll add a test for it as well, early this comming week. Thanks! Neil -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html