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

Re: rename detection limit checking, cherry picking, and git am -3

From
Junio C Hamano <gitster@pobox.com>
Date
Sep 17, 2007, 04:27 UTC
Message-ID
<7v3axd5325.fsf@gitster.siamese.dyndns.org>
In-Reply-To
<20070917034742.GG3099@spearce.org>
"Shawn O. Pearce" <spearce@spearce.org> writes:
> I actually don't see why cherry-pick can't be defined in terms
> of `format-patch|am -3`.  It probably would be faster in almost
> all cases.

Heh, people often suggested that rebase should get --merge as default, and I resisted that.

I think it would make sense to do the consolidated backend for rebase, revert, cherry-pick and am (I have been tentatively calling this "git replay") primarily based on the "patch with fallback to 3-way" like format-patch piped to "am -3", with an option to do merge-recursive.

Previous: Shawn O. PearceNext: Karl Hasselström
Message 3 of 5 in “rename detection limit checking, cherry picking, and git am -3”
  1. Mark LevedahlSep 17, 2007
  2. Shawn O. PearceSep 17, 2007
  3. Junio C HamanoSep 17, 2007
  4. Karl HasselströmSep 17, 2007
  5. Mark LevedahlSep 18, 2007

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.