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

[PATCH 0/2] combine-diff consistency fixes

From
MWMark Wooding <mdw@distorted.org.uk>
Date
Feb 27, 2006, 12:48 UTC
Message-ID
<20060227124815.25144.83101.stgit@metalzone.distorted.org.uk>

The output of git diff-tree --cc on a merge is not consistent with its output for a normal commit. In particular:

  * the index lines on a combined diff are abbreviated even if
    --full-index is given, and
  * the headers on a combined diff are not null terminated, even if -z
    is given.
For example, run
  git-diff-tree --cc -z --full-index f0b0af1b04f558b684cae2a3b805ca4bab84d45f
-- [mdw]
Next: Mark Wooding
Message 1 of 3 in “combine-diff consistency fixes”
  1. 0/2 combine-diff consistency fixesMark Wooding, Feb 27, 2006
  2. 1/2 combine-diff: Honour --full-index.Mark Wooding, Feb 27, 2006
  3. 2/2 combine-diff: Honour -z option correctly.Mark Wooding, Feb 27, 2006

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.