From: Federico Mena Quintero <federico@novell.com>
Date: Tue, 02 Oct 2007 23:30:17 GMT
Subject: [PATCH 0/4] Another round of the --track patches
Message-ID: <1191367817.3776.192.camel@cacharro.xalalinux.org>
In-Reply-To: <7v3axbvbto.fsf@gitster.siamese.dyndns.org>

On Tue, 2007-09-18 at 15:38 -0700, Junio C Hamano wrote:
> Federico Mena Quintero <federico@novell.com> writes:
> > -	retrieve data from the remote branch.  Set the
> > +	retrieve data from the remote branch, otherwise you'll have to
> > +	use "git pull <url>" explicitly.  Set the
> >  	branch.autosetupmerge configuration variable to true if you
> >  	want git-checkout and git-branch to always behave as if
> >  	'--track' were given.
> 
> Hmph.
> 
> I'd rather make them consistent by dropping the not-so-correct
> "otherwise" phrase from all three copies.  It is not "otherwise
> you'll have to", but "instead you can".

Sure, I've added better wording now.

> I am inclined to suggest rewording the message like this, and
> make this condition an error (i.e. "exit 1"):
[snip]

I like that message much better, and it's nice that it gives you the
snippet to put in your config file.  This is in patch 4/4.

Thanks for the review; I hope this can make it in now ;)

  Federico