From: Neil Horman <nhorman@tuxdriver.com>
Date: Sat, 31 Mar 2012 12:57:16 GMT
Subject: Re: [PATCH 1/4] git-cherry-pick: add keep-empty option
Message-ID: <20120331125716.GA2409@neilslaptop.think-freely.org>
In-Reply-To: <1333136922-12872-2-git-send-email-nhorman@tuxdriver.com>

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@tuxdriver.com>
> CC: Jeff King <peff@peff.net>
> CC: Phil Hord <phil.hord@gmail.com>
> CC: Junio C Hamano <gitster@pobox.com>
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