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

Re: cg-merge should use git-merge

From
Junio C Hamano <junkio@cox.net>
Date
Oct 17, 2005, 08:31 UTC
Message-ID
<7vzmp81r4n.fsf@assigned-by-dhcp.cox.net>
In-Reply-To
<46a038f90510161744m7e95303eu8a9942363ffc58a6@mail.gmail.com>
Martin Langhoff <martin.langhoff@gmail.com> writes:
> - Junio, would you tolerate a flag for git-merge that says "don't
> autocommit even on cleanly merged"?
I'd *welcome* not just tolerate.

Currently both git-am and git-applypatch call git-merge-resolve directly, but they should really be calling git-merge with user supplied strategy with '-s' parameter. By bypassing git-merge, they happen to get the "do not commit when you fall back on 3-way merge" semantics, but that is just by accident.

I have a plan to rewrite git-cherry-pick using git-format-patch piped into git-am (I have not scripted it, but that is the primary way I do cherry-picks these days), and being able to customize what happens after merge by git-merge would probably be useful there as well.

Next: Junio C Hamano
Message 1 of 4 in “Re: cg-merge should use git-merge”
  1. Junio C HamanoOct 17, 2005
  2. Junio C HamanoOct 17, 2005
  3. Fwd: cg-merge should use git-mergeMartin Langhoff, Oct 19, 2005
  4. Martin LanghoffOct 20, 2005

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.