From: Steffen Prohaska <prohaska@zib.de>
Date: Fri, 02 Nov 2007 14:49:37 GMT
Subject: Re: [PATCH 10/10] push: teach push to be quiet if local ref is strict subset of remote ref
Message-ID: <8C8648EB-8434-46FC-A6F6-9DE146ACB373@zib.de>
In-Reply-To: <472B2B8F.1060203@op5.se>


On Nov 2, 2007, at 2:52 PM, Andreas Ericsson wrote:

>> I haven't had occasion to use git-bisect much, but I was under the
>> impression that bisect could already handle merges, or any other  
>> shaped
>> history just fine.
>
> It appears the code supports your statement. I started writing on my
> hack-around about a year ago, and the merge-handling code got in with
> 1c4fea3a40e836dcee2f16091bf7bfba96c924d0 at Wed Mar 21 22:16:24 2007.
> Perhaps I shouldn't be so paranoid about useless merges anymore then.
> Hmm. I shall have to look into it. Perhaps Junio can clarify how it
> works? The man-page was terribly silent about how git-bisect handles
> merges.

So eventually there's coming something good out of this thread,
without actually writing any code ;)

	Steffen