From: Junio C Hamano Date: Mon, 03 Jun 2013 19:21:10 GMT Subject: Re: [PATCH v2 3/8] cherry-pick: add --skip-empty option Message-ID: <7vtxlfc861.fsf@alter.siamese.dyndns.org> In-Reply-To: <7vr4gjdomk.fsf@alter.siamese.dyndns.org> Junio C Hamano writes: > Felipe Contreras writes: > >> Pretty much what it says on the tin. >> >> Signed-off-by: Felipe Contreras >> --- >> Documentation/git-cherry-pick.txt | 3 +++ >> builtin/revert.c | 2 ++ >> sequencer.c | 6 ++++++ >> sequencer.h | 1 + >> t/t3508-cherry-pick-many-commits.sh | 13 +++++++++++++ >> 5 files changed, 25 insertions(+) >> >> diff --git a/Documentation/git-cherry-pick.txt b/Documentation/git-cherry-pick.txt >> index c205d23..fccd936 100644 >> --- a/Documentation/git-cherry-pick.txt >> +++ b/Documentation/git-cherry-pick.txt >> @@ -129,6 +129,9 @@ effect to your index in a row. >> redundant commits are ignored. This option overrides that behavior and >> creates an empty commit object. Implies `--allow-empty`. >> >> +--skip-empty:: >> + Instead of failing, skip commits that are or become empty. > > Not quite sure. Is this "instead of recording an empty commit," > (which may or may not fail depending on the allow-empty settings)? > > If that is what this patch is meant to do, I think the change makes > sense. Also what I noticed while looking at 4-5/8. Wouldn't "revert --skip-empty A..B" make sense as well?