From: Felipe Contreras Date: Thu, 06 Jun 2013 18:34:55 GMT Subject: Re: [PATCH v3 3/9] cherry-pick: add --skip-empty option Message-ID: In-Reply-To: <7vbo7jytv5.fsf@alter.siamese.dyndns.org> On Thu, Jun 6, 2013 at 1:30 PM, Junio C Hamano wrote: > Felipe Contreras writes: > >> Pretty much what it says on the tin. > > And a bit more, isn't it? > > The --keep-redundant-commits option implies the --allow-empty option > and it was perfectly acceptable to give both. By making sure that > only at most one of -k-r-d, -a-e or -s-e is given, this forbids that > usage. > > "It is implied so there is no *need* to give it redundantly" is > different from "It is implied so you shouldn't give it redundantly". Remove that line then. > Like 7 and 8 that adds --quiet/--skip, don't we want this also for > revert? If we don't want --allow-empty in revert, we don't want --skip-empty either. That is a separate patch. -- Felipe Contreras