git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH v3 3/9] cherry-pick: add --skip-empty option

From
Felipe Contreras <felipe.contreras@gmail.com>
Date
Jun 6, 2013, 18:34 UTC
Message-ID
<CAMP44s3b2K0nbfuhNqB6FNevdPjVByQCpAie5nzAjx8bw5Y+RQ@mail.gmail.com>
In-Reply-To
<7vbo7jytv5.fsf@alter.siamese.dyndns.org>
On Thu, Jun 6, 2013 at 1:30 PM, Junio C Hamano <gitster@pobox.com> wrote:
Show 13 quoted lines
> Felipe Contreras <felipe.contreras@gmail.com> 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
Previous: Junio C HamanoNext: Junio C Hamano
Message 6 of 18 in “cherry-pick: improvements”
  1. 0/9 cherry-pick: improvementsFelipe Contreras, Jun 6, 2013
  2. 1/9 sequencer: remove useless indentationFelipe Contreras, Jun 6, 2013
  3. 2/9 sequencer: trivial fixFelipe Contreras, Jun 6, 2013
  4. 3/9 cherry-pick: add --skip-empty optionFelipe Contreras, Jun 6, 2013
  5. Junio C HamanoJun 6, 2013
  6. Felipe ContrerasJun 6, 2013
  7. Junio C HamanoJun 6, 2013
  8. Junio C HamanoJun 6, 2013
  9. Felipe ContrerasJun 7, 2013
  10. 4/9 cherry-pick: store rewritten commitsFelipe Contreras, Jun 6, 2013
  11. 5/9 sequencer: run post-rewrite hookFelipe Contreras, Jun 6, 2013
  12. Junio C HamanoJun 6, 2013
  13. Felipe ContrerasJun 9, 2013
  14. 6/9 cherry-pick: add support to copy notesFelipe Contreras, Jun 6, 2013
  15. Felipe ContrerasJun 6, 2013
  16. 7/9 revert/cherry-pick: add --quiet optionFelipe Contreras, Jun 6, 2013
  17. 8/9 revert/cherry-pick: add --skip optionFelipe Contreras, Jun 6, 2013
  18. 9/9 cherry-pick: don't barf when there's nothing to doFelipe Contreras, Jun 6, 2013

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.