From: Miles Bader <miles@gnu.org>
Date: Tue, 01 Mar 2011 01:39:41 GMT
Subject: Re: [1.8.0] fix branch.autosetupmerge and branch.autosetuprebase
Message-ID: <871v2rd3fm.fsf@catnip.gol.com>
In-Reply-To: <AANLkTi=Ei-Gr3=O0_dfaCekQ0+nB8v1kZYT7sTw-Ydm+@mail.gmail.com>

Jay Soffian <jaysoffian@gmail.com> writes:
> So, my proposal wrt to branch.autosetupmerge is that we deprecate it
> and always do the following:
>
> - When creating a local branch L from remote-tracking branch R, set R
> as upstream of L.
> - When creating a local branch L1 from other local branch L2, whose
> upstream is remote-tracking branch R, set R as upstream of L1.

That would certainly match my usage better...

-miles

-- 
Everywhere is walking distance if you have the time.  -- Steven Wright