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
Martin von Zweigbergk <martin.von.zweigbergk@gmail.com>
Date
Dec 27, 2010, 15:38 UTC
Message-ID
<alpine.DEB.1.10.1012271630560.788@debian>
In-Reply-To
<20101227212515.GA32352@burratino>
On Mon, 27 Dec 2010, Jonathan Nieder wrote:
Show 18 quoted lines
> Jonathan Nieder wrote:
> 
> > 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?
> 
> Ping?  I use this with -Xpatience fairly often.  Am I the only one who
> has wanted such a thing?

FWIW, I have wanted it for the end-of-line scenario you describe above.

/Martin
Previous: Jonathan NiederNext: Justin Frankel
Message 5 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.