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

Re: git-format-patch for binary files / merges [Re: Expose subprojects as special files to "git diff" machinery]

From
Johannes Schindelin <johannes.schindelin@gmx.de>
Date
Apr 19, 2007, 08:28 UTC
Message-ID
<Pine.LNX.4.64.0704191026500.8822@racer.site>
In-Reply-To
<alpine.LFD.0.98.0704180831330.2828@woody.linux-foundation.org>
Hi,
On Wed, 18 Apr 2007, Linus Torvalds wrote:
> As to merges, they are certainly something that *can* be represented as a 
> patch [...]
> However, representing merges as a patch doesn't really make much sense.

Not if you want to apply it. But if you want to review it. That's why we have the combined diff format, which can be generated by diff, but not applied.

Ciao, Dscho

Previous: Junio C Hamano
Message 12 of 12 in “Expose subprojects as special files to "git diff" machinery”
  1. Linus TorvaldsApr 15, 2007
  2. Sam RavnborgApr 15, 2007
  3. Linus TorvaldsApr 15, 2007
  4. Sam RavnborgApr 15, 2007
  5. Andy ParkinsApr 15, 2007
  6. Linus TorvaldsApr 15, 2007
  7. git-format-patch for binary files / merges [Re: Expose subprojects as special files to "git diff" machinery]Sam Vilain, Apr 18, 2007
  8. Alex RiesenApr 18, 2007
  9. Johannes SchindelinApr 18, 2007
  10. Linus TorvaldsApr 18, 2007
  11. Junio C HamanoApr 18, 2007
  12. Johannes SchindelinApr 19, 2007

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.