From: Junio C Hamano <gitster@pobox.com>
To: layer <layer@known.net>
Cc: git@vger.kernel.org
Subject: Re: git diff after merge (with conflict)
Date: Fri, 10 Apr 2009 17:47:33 -0700 [thread overview]
Message-ID: <7vvdpcnhi2.fsf@gitster.siamese.dyndns.org> (raw)
In-Reply-To: 324.1239298063@relay.known.net
layer <layer@known.net> writes:
> 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.
If you mean the resolution preview (that is you said "after merge with
conflict", but what you meant was really "during a merge with conflict, I
haven't recorded the final resolution with git-add yet"), I often find
these two useful:
What change does the other branch brought to my tree anyway?
$ git diff HEAD -- that-file
What did we do to the other branch?
$ git diff MERGE_HEAD -- that-file
prev parent reply other threads:[~2009-04-11 0:49 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
2009-04-11 0:47 ` Junio C Hamano [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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7vvdpcnhi2.fsf@gitster.siamese.dyndns.org \
--to=gitster@pobox.com \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.