From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 18 Sep 2007 22:38:27 GMT
Subject: Re: [PATCH 3/4] Mention the parameters that git-pull would need to be equivalent to a --track in the git-checkout docs
Message-ID: <7v3axbvbto.fsf@gitster.siamese.dyndns.org>
In-Reply-To: <1190077881.22387.63.camel@cacharro.xalalinux.org>

Federico Mena Quintero <federico@novell.com> writes:

> To be consistent with the git-branch docs.
>
> Signed-off-by: Federico Mena Quintero <federico@gnu.org>
> ---
>  Documentation/git-checkout.txt |    3 ++-
>  1 files changed, 2 insertions(+), 1 deletions(-)
>
> diff --git a/Documentation/git-checkout.txt b/Documentation/git-checkout.txt
> index 734928b..6f22626 100644
> --- a/Documentation/git-checkout.txt
> +++ b/Documentation/git-checkout.txt
> @@ -50,7 +50,8 @@ OPTIONS
>  --track::
>  	When -b is given and a branch is created off a remote branch,
>  	set up configuration so that git-pull will automatically
> -	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".