From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Sam Vilain <sam@vilain.net>, Andy Parkins <andyparkins@gmail.com>,
git@vger.kernel.org, Junio C Hamano <junkio@cox.net>
Subject: Re: git-format-patch for binary files / merges [Re: Expose subprojects as special files to "git diff" machinery]
Date: Thu, 19 Apr 2007 10:28:30 +0200 (CEST) [thread overview]
Message-ID: <Pine.LNX.4.64.0704191026500.8822@racer.site> (raw)
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
prev parent reply other threads:[~2007-04-19 8:28 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-04-15 18:14 Expose subprojects as special files to "git diff" machinery Linus Torvalds
2007-04-15 19:01 ` Sam Ravnborg
2007-04-15 19:05 ` Linus Torvalds
2007-04-15 19:20 ` Sam Ravnborg
2007-04-15 20:16 ` Andy Parkins
2007-04-15 21:03 ` Linus Torvalds
2007-04-18 8:46 ` git-format-patch for binary files / merges [Re: Expose subprojects as special files to "git diff" machinery] Sam Vilain
2007-04-18 11:49 ` Alex Riesen
2007-04-18 11:52 ` Johannes Schindelin
2007-04-18 15:47 ` Linus Torvalds
2007-04-18 16:08 ` Junio C Hamano
2007-04-19 8:28 ` Johannes Schindelin [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=Pine.LNX.4.64.0704191026500.8822@racer.site \
--to=johannes.schindelin@gmx.de \
--cc=andyparkins@gmail.com \
--cc=git@vger.kernel.org \
--cc=junkio@cox.net \
--cc=sam@vilain.net \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).