From: Junio C Hamano <junkio@cox.net>
To: Martin Langhoff <martin.langhoff@gmail.com>
Cc: Petr Baudis <pasky@ucw.cz>, Git Mailing List <git@vger.kernel.org>
Subject: Re: cg-merge should use git-merge
Date: Mon, 17 Oct 2005 01:31:36 -0700 [thread overview]
Message-ID: <7vzmp81r4n.fsf@assigned-by-dhcp.cox.net> (raw)
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 parent reply other threads:[~2005-10-17 8:31 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <46a038f90510161644l35119401rdc05c081506ae715@mail.gmail.com>
[not found] ` <46a038f90510161744m7e95303eu8a9942363ffc58a6@mail.gmail.com>
2005-10-17 8:31 ` Junio C Hamano [this message]
[not found] ` <46a038f90510170203ndee2b2bi913b62014614f68e@mail.gmail.com>
2005-10-17 9:26 ` cg-merge should use git-merge Junio C Hamano
2005-10-19 11:21 ` Fwd: " Martin Langhoff
2005-10-20 7:04 ` Martin Langhoff
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7vzmp81r4n.fsf@assigned-by-dhcp.cox.net \
--to=junkio@cox.net \
--cc=git@vger.kernel.org \
--cc=martin.langhoff@gmail.com \
--cc=pasky@ucw.cz \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox