From: Shawn Bohrer <shawn.bohrer@gmail•com>
To: git@vger•kernel.org
Subject: Confusion about diffing branches
Date: Sun, 26 Aug 2007 18:35:55 -0500 [thread overview]
Message-ID: <20070826233555.GA7422@mediacenter.austin.rr.com> (raw)
So I imagine I'm missing something, or perhaps I'm just looking at this
from the wrong perspective, but here is what I'm seeing. Lets say I
have something like:
A---B topic
/
C---D---E master
If I want to see a diff of all of the changes between the two branches I
can say:
git diff master topic
Which shows me the combined diff of commits A, B and E. That is exactly
what I would expect however, I would expect that equivalently I could
say:
git diff master...topic
to see all commits reachable from topic and master but not both.
However, this doesn't do what I expect but instead only shows me the
combined diff of A and B. Likewise:
git diff topic...master
Shows me the diff of E. Am I crazy or isn't this supposed to be the
behavior of the topic..master notation? Strangely enough running either
git diff master..topic
git diff topic..master
both show me the diff of A, B and E, which is what I would expect from
the master...topic notation. Am I the only one who thinks this is
backwards? The same experiment using git log shows me what I would
expect so somehow I think I'm missing something.
next reply other threads:[~2007-08-26 23:34 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-08-26 23:35 Shawn Bohrer [this message]
2007-08-27 0:18 ` Confusion about diffing branches Junio C Hamano
2007-08-27 1:40 ` Shawn Bohrer
2007-08-27 6:25 ` Mike Hommey
2007-08-27 7:07 ` Junio C Hamano
2007-08-27 7:50 ` Mike Hommey
2007-08-27 13:21 ` Francis Moreau
2007-08-27 13:33 ` Mike Hommey
2007-08-27 17:06 ` Junio C Hamano
2007-08-27 17:24 ` Mike Hommey
2007-08-27 17:05 ` Theodore Tso
2007-08-27 17:20 ` Junio C Hamano
2007-08-27 20:29 ` Theodore Tso
2007-08-27 22:20 ` Jakub Narebski
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=20070826233555.GA7422@mediacenter.austin.rr.com \
--to=shawn.bohrer@gmail$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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