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
Jonathan Nieder <jrnieder@gmail.com>
Date
Dec 28, 2010, 19:37 UTC
Message-ID
<20101228193700.GA4303@burratino>
In-Reply-To
<7v7hetyeom.fsf@alter.siamese.dyndns.org>
Junio C Hamano wrote:
> Pong, if you are pinging me.  I thought you wanted to only discuss it
> first with RFC and meant to follow up on a real-for-inclusion patch.

You thought correctly. In this case I can't think of any change this needs on top to make this real for inclusion so I just bumped the thread.

There were two hints at improvements in this thread (separate topic): the "git merge" manual could use some discussion of the distinction between --renormalize and --ignore-whitespace-at-eol, and am, rebase, stash, and "checkout -m <tree>" ought to have -X plumbed, too.

Previous: Junio C Hamano
Message 8 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.