From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Thu, 19 Apr 2007 08:28:30 GMT
Subject: Re: git-format-patch for binary files / merges [Re: Expose subprojects as special files to "git diff" machinery]
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