Re: cg-merge should use git-merge

Martin Langhoff [off-list ref] 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.