* git diff after merge (with conflict)
@ 2009-04-09 17:27 layer
2009-04-09 17:40 ` Teemu Likonen
2009-04-11 0:47 ` Junio C Hamano
0 siblings, 2 replies; 3+ messages in thread
From: layer @ 2009-04-09 17:27 UTC (permalink / raw)
To: git
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.
Thanks.
Kevin
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: git diff after merge (with conflict)
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
1 sibling, 0 replies; 3+ messages in thread
From: Teemu Likonen @ 2009-04-09 17:40 UTC (permalink / raw)
To: layer; +Cc: git
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.
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: git diff after merge (with conflict)
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
1 sibling, 0 replies; 3+ messages in thread
From: Junio C Hamano @ 2009-04-11 0:47 UTC (permalink / raw)
To: layer; +Cc: git
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
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2009-04-11 0:49 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
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 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).