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
Alex Riesen <raa.lkml@gmail.com>
Date
Apr 18, 2007, 11:49 UTC
Message-ID
<81b0412b0704180449k34ac2606w82b8557d7d05945f@mail.gmail.com>
In-Reply-To
<4625DAEE.3090702@vilain.net>
On 4/18/07, Sam Vilain <sam@vilain.net> wrote:
Show 17 quoted lines
> Linus Torvalds wrote:
> >> Isn't this dangerous because it looks just like a normal diff with a
> >> file being rewritten, when in truth it is a tree entry record being
> >> rewritten.
> >>
> > Well, that's exactly what symlinks do too.
> >
> > You have to look at the mode to know what the rewriting *means*.
> >
> > But yeah, I wouldn't object at all to making it an "extended git header"
> > instead (possibly just for subprojects, possibly for symlinks too)
> >
>
> Speaking of 'custom' patch file formats, anyone put any thought to a
> format for the commits which can't be represented with patch, like
> binary files and merges?
>

There is binary diff (look for --binary in Documentation/). And regarding merges: have you looked at git-bundle yet?

Previous: Sam VilainNext: Johannes Schindelin
Message 8 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.