Re: defaults for where to merge from

From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Feb 28, 2007, 15:13 UTC
Message-ID: <Pine.LNX.4.63.0702281611140.22628@wbgn013.biozentrum.uni-wuerzburg.de>
In-Reply-To: <es450f$d58$1@sea.gmane.org>

Hi,

On Wed, 28 Feb 2007, Paolo Bonzini wrote:

Show 11 quoted lines

> As can be seen from my other messages, I'm experimenting a little with 
> git and trying to understand how its workflow compares with arch.  
> Right now, my procedure for branching off a remote archive is:
> 
>   git checkout -b branchname remote/upstreambranch
>   git config --add branch.branchname.remote remote
>   git config --add branch.branchname.merge refs/heads/upstreambranch
> 
> Is there a reason why "git branch" and "git checkout -b" should not 
> automatically do the two "git-config --add"s when the source branch is 
> remote?

I like it.

> In case the source branch is not remote, would "origin" be a good choice 
> for the "branch.branchname.remote" variable?

In case source branch is not a remote, I would not want that DWIMery.

Ciao, Dscho