Re: [PATCH 1/2] branch: optionally setup branch.*.merge from upstream local branches

From: Jay Soffian <jaysoffian@gmail.com>
Date: Feb 19, 2008, 16:33 UTC
Message-ID: <76718490802190833p68d361b4jf93ac196fe671d6b@mail.gmail.com>
In-Reply-To: <1203438278-73786-1-git-send-email-jaysoffian@gmail.com>

On Feb 19, 2008 11:24 AM, Jay Soffian <jaysoffian@gmail.com> wrote:

Show 8 quoted lines

> git branch / git checkout -b now honor --track when the upstream branch
> is local. Previously --track was silently ignored for local upstream
> branches.
>
> The configuration setting branch.autosetupmerge can now be set to
> "always" which is equivalent to using --track. Setting
> branch.autosetupmerge to boolean true will retains the former behavior
> of only setting up branch.*.merge for remote upstream branches.

I re-used my commit message w/o thinking enough. The truth is:

 * '--track' fails if the starting point isn't a branch.

 * autosetupmerge=always sets up tracking if the starting point is a branch
   (local or remote), otherwise (if starting point is not a branch) it is
   ignored.

j.