From: Petr Baudis <pasky@ucw.cz>
To: git@vger.kernel.org
Subject: Union diff
Date: Sun, 26 Mar 2006 12:21:00 +0200 [thread overview]
Message-ID: <20060326102100.GF18185@pasky.or.cz> (raw)
Hello,
sorry for possibly a silly question, but can I get a diff of a merge
commit with _union_ of changes against all the parents?
$ git-diff-tree --abbrev -r -m --pretty=raw badfc383b
diff-tree badfc38... (from 1ee6c84...)
tree 29d81f18912328df4f4104e9b9cc355424ced04d
parent 1ee6c84efda742eda8b4b200491341125d8d9639
parent 453b160f03c8c6d450879482f617412c257e5889
author Petr Baudis <pasky@suse.cz> 1143328578 +0100
committer Petr Baudis <xpasky@machine.or.cz> 1143328578 +0100
Merge with v0.17
:100755 100755 743c19f... b05900d... M Documentation/make-cogito-asciidoc
:100644 100644 5896df7... 6f06c35... M cg-Xlib
diff-tree badfc38... (from 453b160...)
tree 29d81f18912328df4f4104e9b9cc355424ced04d
parent 1ee6c84efda742eda8b4b200491341125d8d9639
parent 453b160f03c8c6d450879482f617412c257e5889
author Petr Baudis <pasky@suse.cz> 1143328578 +0100
committer Petr Baudis <xpasky@machine.or.cz> 1143328578 +0100
Merge with v0.17
:100644 100644 24ce0a4... d540853... M TODO
:100755 100755 6005083... f7efa9d... M cg-log
I would like something like:
diff-tree badfc38... (from parents)
tree 29d81f18912328df4f4104e9b9cc355424ced04d
parent 1ee6c84efda742eda8b4b200491341125d8d9639
parent 453b160f03c8c6d450879482f617412c257e5889
author Petr Baudis <pasky@suse.cz> 1143328578 +0100
committer Petr Baudis <xpasky@machine.or.cz> 1143328578 +0100
Merge with v0.17
:100755 100755 743c19f... b05900d... M Documentation/make-cogito-asciidoc
:100644 100644 24ce0a4... d540853... M TODO
:100644 100644 5896df7... 6f06c35... M cg-Xlib
:100755 100755 6005083... f7efa9d... M cg-log
Now, the -c option documentation says:
It shows the differences from each of the parents to the merge
result simultaneously, instead of showing pairwise diff between
a parent and the result one at a time, which '-m' option output
does.
This sounds as exactly what I want. Well, the only problem is that the
same diff command as above with -c option added produces no diff at all,
just the header and commit messages. Did I misunderstand the -c
description and does it do something different?
Thanks,
--
Petr "Pasky" Baudis
Stuff: http://pasky.or.cz/
Right now I am having amnesia and deja-vu at the same time. I think
I have forgotten this before.
next reply other threads:[~2006-03-26 10:21 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-03-26 10:21 Petr Baudis [this message]
2006-04-09 9:45 ` Union diff Junio C Hamano
2006-04-09 13:43 ` [PATCH] Improve the git-diff-tree -c/-cc documentation Petr Baudis
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=20060326102100.GF18185@pasky.or.cz \
--to=pasky@ucw.cz \
--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