From: Teemu Likonen <tlikonen@iki.fi>
To: layer <layer@known.net>
Cc: git@vger.kernel.org
Subject: Re: git diff after merge (with conflict)
Date: Thu, 09 Apr 2009 20:40:51 +0300 [thread overview]
Message-ID: <87ljq97mjg.fsf@iki.fi> (raw)
In-Reply-To: <324.1239298063@relay.known.net> (layer@known.net's message of "Thu\, 09 Apr 2009 10\:27\:43 -0700")
On 2009-04-09 10:27 (-0700), layer wrote:
> Is there some way to get regular unified diff behavior instead of the
> combined diff? For certain files (like ChangeLog's) the combined diff
> format after a merge is *very* confusing.
Maybe the following commands are helpful:
git diff --base
git diff --ours
git diff --theirs
Those options are not documented in git-diff(1), by the way.
next prev parent reply other threads:[~2009-04-09 17:42 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-04-09 17:27 git diff after merge (with conflict) layer
2009-04-09 17:40 ` Teemu Likonen [this message]
2009-04-11 0:47 ` Junio C Hamano
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=87ljq97mjg.fsf@iki.fi \
--to=tlikonen@iki.fi \
--cc=git@vger.kernel.org \
--cc=layer@known.net \
/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).