From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 10 Apr 2012 19:32:18 GMT
Subject: Re: [PATCH v3 1/4] git-cherry-pick: add allow-empty option
Message-ID: <7vfwcbpem5.fsf@alter.siamese.dyndns.org>
In-Reply-To: <20120410181317.GA17776@hmsreliant.think-freely.org>

Neil Horman <nhorman@tuxdriver.com> writes:

> On Tue, Apr 10, 2012 at 09:45:46AM -0700, Junio C Hamano wrote:
> ...
>>  (2) The message is given by the "git commit" command.  "If the commit was
>>      created empty" looks confusing.  Even though I can understand that
> Its coded within the git commit command code, but is only ever displayed if
> whence is GIT_CHERRY_PICK, so as far as I can see, from a users perspective,
> this will only be seen if they type git cherry-pick on the command line.

Here is what I tried, and I think you are wrong.

	$ git cherry-pick $some_commit
        ... conflicts ...
        $ edit so that the working tree matches HEAD
        $ git commit -a
        ... message from status ...
        THE ADVICE IN QUEWSTION COMES HERE!!!