From: Junio C Hamano <gitster@pobox•com>
To: Robert Dailey <rcdailey.lists@gmail•com>
Cc: Git <git@vger•kernel.org>
Subject: Re: diff <commit> using 3-dot behavior
Date: Wed, 24 Aug 2016 09:22:40 -0700 [thread overview]
Message-ID: <xmqqbn0irvan.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <CAHd499DL2WiTgnk5A--qihUh-jF9m7aXDzHAQuW=bLRVW4Bniw@mail.gmail.com> (Robert Dailey's message of "Wed, 24 Aug 2016 09:28:24 -0500")
Robert Dailey <rcdailey.lists@gmail•com> writes:
> $ git diff master...topic
... which is defined roughly as
git diff $(git merge-base master topic) topic
The merge-base is to compute the point you forked your topic from
the mainline. So if you want to compare your current state in the
index with the fork point, you'd do
git diff --cached $(git merge-base master topic)
and comparing your working tree state would be
git diff --cached $(git merge-base master topic)
next prev parent reply other threads:[~2016-08-24 16:24 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-08-24 14:28 diff <commit> using 3-dot behavior Robert Dailey
2016-08-24 16:00 ` Michael J Gruber
2016-08-24 16:10 ` Robert Dailey
2016-08-24 16:22 ` Junio C Hamano [this message]
2016-08-24 20:48 ` Jacob Keller
2016-08-24 21:39 ` Jeff King
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=xmqqbn0irvan.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=rcdailey.lists@gmail$(echo .)com \
/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