From mboxrd@z Thu Jan 1 00:00:00 1970 From: Johannes Schindelin 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) Message-ID: References: <200704152116.26773.andyparkins@gmail.com> <4625DAEE.3090702@vilain.net> Mime-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Cc: Sam Vilain , Andy Parkins , git@vger.kernel.org, Junio C Hamano To: Linus Torvalds X-From: git-owner@vger.kernel.org Thu Apr 19 10:28:56 2007 Return-path: Envelope-to: gcvg-git@gmane.org Received: from vger.kernel.org ([209.132.176.167]) by lo.gmane.org with esmtp (Exim 4.50) id 1HeS0c-0006LL-9A for gcvg-git@gmane.org; Thu, 19 Apr 2007 10:28:54 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1031205AbXDSI2t (ORCPT ); Thu, 19 Apr 2007 04:28:49 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1031207AbXDSI2s (ORCPT ); Thu, 19 Apr 2007 04:28:48 -0400 Received: from mail.gmx.net ([213.165.64.20]:42349 "HELO mail.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1031205AbXDSI2q (ORCPT ); Thu, 19 Apr 2007 04:28:46 -0400 Received: (qmail invoked by alias); 19 Apr 2007 08:28:44 -0000 Received: from unknown (EHLO [138.251.11.74]) [138.251.11.74] by mail.gmx.net (mp003) with SMTP; 19 Apr 2007 10:28:44 +0200 X-Authenticated: #1490710 X-Provags-ID: V01U2FsdGVkX1+LX2h1S6qLp/MaCX0oTFZkg4VtJXyifCqqsao1Un EMlqMs3JkP30VR X-X-Sender: gene099@racer.site In-Reply-To: X-Y-GMX-Trusted: 0 Sender: git-owner@vger.kernel.org Precedence: bulk X-Mailing-List: git@vger.kernel.org Archived-At: 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