From: J. Bruce Fields <bfields@fieldses.org>
Date: Fri, 02 Mar 2007 15:53:48 GMT
Subject: Re: defaults for where to merge from
Message-ID: <20070302155348.GB24547@fieldses.org>
In-Reply-To: <7vejo9xtot.fsf@assigned-by-dhcp.cox.net>

On Thu, Mar 01, 2007 at 12:18:58AM -0800, Junio C Hamano wrote:
> "Alex Riesen" <raa.lkml@gmail.com> writes:
> 
> >> If everyone hated the old behavior, old users should already be careful
> >> about not git-pull'ing (without options) from any branch but master.  So
> >> they won't see any difference.
> >
> > except for .git/config growing uncontrollably
> 
> I think this should be a new option, not the _modified default_.
> Otherwise it would be harder to sell to olde timers.
> 
> 	$ git checkout -B <newbranch> remotes/<blah>
>         $ git branch --track <newbranch> remotes/<blah>
> 
> might be a good compromise.

Personally I usually use <blah> as <newbranch>.  I might have gone for
something like

	git remote checkout [remote] blah [-b newbranch]

with defaulted to newbranch = blah.

--b.