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

Re: combined diff, but not condensed, howto?

From
Junio C Hamano <gitster@pobox.com>
Date
Sep 17, 2008, 16:58 UTC
Message-ID
<7vwsha6761.fsf@gitster.siamese.dyndns.org>
In-Reply-To
<48D0B907.7040903@viscovery.net>
Johannes Sixt <j.sixt@viscovery.net> writes:
> After a merge conflict, 'git diff' shows a combined diff, which presents
> only the parts that conflicted or where there are near-by changes from
> different parents (potential conflicts). Is there a command line switch so
> that *all* changes are shown, even non-conflicting ones?
Like "git diff HEAD"?
Previous: Johannes SixtNext: Johannes Sixt
Message 2 of 9 in “combined diff, but not condensed, howto?”
  1. Johannes SixtSep 17, 2008
  2. Junio C HamanoSep 17, 2008
  3. Johannes SixtSep 18, 2008
  4. Junio C HamanoSep 18, 2008
  5. Johannes SixtSep 18, 2008
  6. Junio C HamanoSep 18, 2008
  7. Johannes SixtSep 18, 2008
  8. diff/diff-files: do not use --cc too aggressivelyJunio C Hamano, Sep 18, 2008
  9. Johannes SixtSep 18, 2008

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.