From: Junio C Hamano Date: Tue, 04 Jun 2013 18:30:29 GMT Subject: Re: [PATCH v2 3/8] cherry-pick: add --skip-empty option Message-ID: <7vvc5t7mpm.fsf@alter.siamese.dyndns.org> In-Reply-To: Felipe Contreras writes: > You didn't answer, what happens when you run --skip-empty and --allow-empty? I'll answer to a slightly different question: What should happen? I think it should error out, because --allow-empty is about "allowing empty commits to be preserved", and --skip-empty is about "skipping empty commits (as it says on the package)".