From: Junio C Hamano <junkio@cox.net>
Date: Mon, 17 Oct 2005 08:31:36 GMT
Subject: Re: cg-merge should use git-merge
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.