From: Jakub Narebski <jnareb@gmail.com>
Date: Sat, 05 Aug 2006 15:05:09 GMT
Subject: Re: [PATCH 7/5] Merge changes in "split patch 1" series
Message-ID: <eb2c1o$9d9$1@sea.gmane.org>
In-Reply-To: <Pine.LNX.4.63.0608051654390.1800@wbgn013.biozentrum.uni-wuerzburg.de>

Johannes Schindelin wrote:
 
> On Sat, 5 Aug 2006, Jakub Narebski wrote:
> 
>> Strange that git-format-patch does not output merges...
> 
> And what exactly should it output? patch against commit^1 or commit^2, 
> etc.? Both? Combined diff?

In my case, commit^1. But I'd be satisfied if it would warn me about missing
commit (the merge was topmost commit).

-- 
Jakub Narebski
Warsaw, Poland
ShadeHawk on #git