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

Re: [RFC/PATCH] cherry-pick/revert: add support for -X/--strategy-option

From
Junio C Hamano <gitster@pobox.com>
Date
Dec 11, 2010, 02:29 UTC
Message-ID
<7vvd319h50.fsf@alter.siamese.dyndns.org>
In-Reply-To
<20101211005144.GA6634@burratino>
Jonathan Nieder <jrnieder@gmail.com> writes:
Show 13 quoted lines
> For example, this would allow cherry-picking or reverting patches from
> a piece of history with a different end-of-line style, like so:
>
> 	$ git revert -Xrenormalize old-problematic-commit
>
> Currently that is possible with manual use of merge-recursive but the
> cherry-pick/revert porcelain does not expose the functionality.
>
> While at it, document the existing support for --strategy.
>
> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
> ---
> Thoughts?

I guess this can also take "ignore whitespace", which might be a better option for this particular use case?

Previous: Jonathan NiederNext: Jonathan Nieder
Message 2 of 8 in “cherry-pick/revert: add support for -X/--strategy-option”
  1. cherry-pick/revert: add support for -X/--strategy-optionJonathan Nieder, Dec 11, 2010
  2. Junio C HamanoDec 11, 2010
  3. Jonathan NiederDec 11, 2010
  4. Jonathan NiederDec 27, 2010
  5. Martin von ZweigbergkDec 27, 2010
  6. Justin FrankelDec 27, 2010
  7. Junio C HamanoDec 28, 2010
  8. Jonathan NiederDec 28, 2010

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.