From: Junio C Hamano Date: Wed, 11 Apr 2012 18:50:29 GMT Subject: Re: [PATCH v3 1/4] git-cherry-pick: add allow-empty option Message-ID: <7vy5q2je6i.fsf@alter.siamese.dyndns.org> In-Reply-To: <20120411182927.GA24833@hmsreliant.think-freely.org> Neil Horman writes: >> But that cannot be correct, without --continue [*1*], i.e. >> >> $ git cherry-pick --allow-empty --continue >> >> no? I didn't check, but if the command without --continue in the above >> sequence does not error out, I think it is a bug. >> > No, it errors out. I'm sorry to have confused you. The only point that I was > trying to make here is that, when running git cherry-pick, its seems awkward to > a user to get advice indicating that git commit --allow-empty should be run. I was only saying that "git cherry-pick --allow-empty" is a *bad* suggestion because it does *not* work and errors out, and you seem to agree with me on that point. I also said I am OK if the suggestion for this case were to run "git cherry-pick --continue". But you sound like you are disagreeing with me; I am not sure where you found what I said not agreeable. So I am not sure what to say at this point.