From: Shawn Pearce <spearce@spearce.org>
To: git@vger.kernel.org
Subject: Why git-merge-resolve in git-am?
Date: Wed, 27 Dec 2006 20:45:25 -0500 [thread overview]
Message-ID: <20061228014525.GC16612@spearce.org> (raw)
Why does git-am use git-merge-resolve while git-rebase -m uses
git-merge-recursive?
Can we just change git-am to use git-merge-recursive instead?
For one thing its faster, for another it supports the GITHEAD_*
feature for naming the hunks in a conflict.
--
Shawn.
next reply other threads:[~2006-12-28 1:45 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-12-28 1:45 Shawn Pearce [this message]
2006-12-28 2:11 ` Why git-merge-resolve in git-am? Junio C Hamano
2006-12-28 2:20 ` Shawn Pearce
2006-12-28 2:28 ` Junio C Hamano
2006-12-28 7:48 ` Shawn Pearce
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=20061228014525.GC16612@spearce.org \
--to=spearce@spearce.org \
--cc=git@vger.kernel.org \
/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;
as well as URLs for NNTP newsgroup(s).