From: Jeff King <peff@peff.net>
To: Chris Leong <walkraft@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: setting merge conflict style
Date: Wed, 15 Feb 2012 00:00:03 -0500 [thread overview]
Message-ID: <20120215050002.GA29902@sigill.intra.peff.net> (raw)
In-Reply-To: <CAJ6vYjcefsPUfibnySpwFk2bGTC1mpBWF6Tjv5AgyyZcn0-d3A@mail.gmail.com>
On Wed, Feb 15, 2012 at 02:12:57PM +1100, Chris Leong wrote:
> Apparently setting merge.conflictstyle to diff3 will display the base
> when diffing an incomplete merge, instead of just ours and theirs.
Yep.
> Is there a way to run this command without setting the config, so that
> I can switch between normal diffs and diff3s easily?
If a conflict is marked in the index (i.e., the state you are in after a
conflicted merge, but before you mark a path as resolved), you can do:
git checkout --conflict=diff3 <path...>
Note that that is actually checking out the index contents into the
working tree, so any edits you may have made to the conflicted working
tree copy will be overwritten.
-Peff
prev parent reply other threads:[~2012-02-15 5:00 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-02-15 3:12 (unknown), Chris Leong
2012-02-15 5:00 ` Jeff King [this message]
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20120215050002.GA29902@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=walkraft@gmail.com \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).