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

diff <commit> using 3-dot behavior

From
RDRobert Dailey <rcdailey.lists@gmail.com>
Date
Aug 24, 2016, 14:28 UTC
Message-ID
<CAHd499DL2WiTgnk5A--qihUh-jF9m7aXDzHAQuW=bLRVW4Bniw@mail.gmail.com>

I want to view the complete diff of my branch (topic) relative to its parent branch (master). This should include cached/staged files and unstaged working tree changes.

If I do this:
$ git diff master

This will include changes on master *since* my last merge, which I do not want (I don't want to see changes on master, only on topic). I tried this:

$ git diff master --not master
This didn't give me any output. If I do this:
$ git diff master...topic

This shows me only committed changes on topic, but excludes staged & unstaged changes.

How can I get the results I want?
Next: Michael J Gruber
Message 1 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.