git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: diff <commit> using 3-dot behavior

From
Jeff King <peff@peff.net>
Date
Aug 24, 2016, 21:39 UTC
Message-ID
<20160824213934.vyfikgj5cccku57z@sigill.intra.peff.net>
In-Reply-To
<CA+P7+xpv--eA8rdgwGLRCucSpVD5X9LjiN3_3Oo9o4L0t5Uk9Q@mail.gmail.com>
On Wed, Aug 24, 2016 at 01:48:30PM -0700, Jacob Keller wrote:
Show 13 quoted lines
> 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
Previous: Jacob Keller
Message 6 of 6 in “diff <commit> using 3-dot behavior”
  1. Robert DaileyAug 24, 2016
  2. Michael J GruberAug 24, 2016
  3. Robert DaileyAug 24, 2016
  4. Junio C HamanoAug 24, 2016
  5. Jacob KellerAug 24, 2016
  6. Jeff KingAug 24, 2016

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.