git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Jeff King <peff@peff.net>
To: Jacob Keller <jacob.keller@gmail.com>
Cc: Junio C Hamano <gitster@pobox.com>,
	Robert Dailey <rcdailey.lists@gmail.com>,
	Git <git@vger.kernel.org>
Subject: Re: diff <commit> using 3-dot behavior
Date: Wed, 24 Aug 2016 17:39:34 -0400	[thread overview]
Message-ID: <20160824213934.vyfikgj5cccku57z@sigill.intra.peff.net> (raw)
In-Reply-To: <CA+P7+xpv--eA8rdgwGLRCucSpVD5X9LjiN3_3Oo9o4L0t5Uk9Q@mail.gmail.com>

On Wed, Aug 24, 2016 at 01:48:30PM -0700, Jacob Keller wrote:

> On Wed, Aug 24, 2016 at 9:22 AM, Junio C Hamano <gitster@pobox.com> wrote:
> > 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)
> >
> 
> Those are both identical?

I imagine the second one just meant to drop "--cached".

-Peff

      reply	other threads:[~2016-08-24 21:47 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
2016-08-24 20:48   ` Jacob Keller
2016-08-24 21:39     ` Jeff King [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

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20160824213934.vyfikgj5cccku57z@sigill.intra.peff.net \
    --to=peff@peff.net \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=jacob.keller@gmail.com \
    --cc=rcdailey.lists@gmail.com \
    /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. 
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

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 read-only IMAP folder(s) and NNTP newsgroup(s).