From: Jeff Garzik <jgarzik@pobox.com>
Date: Wed, 20 Sep 2006 19:24:16 GMT
Subject: Re: git pull for update of netdev fails.
Message-ID: <45119560.7060102@pobox.com>
In-Reply-To: <Pine.LNX.4.64.0609200816400.4388@g5.osdl.org>

Linus Torvalds wrote:
> So you could either mark _all_ the remote branches with the extra "+" (to 
> say that you always want to fetch that exact state for whatever branch 
> you're tracking), or you can ask Jeff which branches he expects to do 
> strange things and just mark those individual ones.


Actually, I only rebase rarely, because it's a pain for downstream people.

Stephen just caught one of the rare occasions where I rebased 
'e100-sbit'.  Note that other branches did not get rebased.

Sorry about that Stephen, I should have posted to netdev.

	Jeff