git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH 3/4] Mention the parameters that git-pull would need to be equivalent to a --track in the git-checkout docs

From
Junio C Hamano <gitster@pobox.com>
Date
Sep 18, 2007, 22:38 UTC
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:
Show 21 quoted lines
> 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".

Previous: Federico Mena QuinteroNext: Federico Mena Quintero
Message 5 of 13 in “Make the documentation consistent for --track and --notrack”
  1. 0/4 Make the documentation consistent for --track and --notrackFederico Mena Quintero, Sep 18, 2007
  2. 1/4 Mention that git-branch will not automatically check out the new branchFederico Mena Quintero, Sep 18, 2007
  3. 2/4 Copy the docs for --track and --notrack from git-checkout to git-branchFederico Mena Quintero, Sep 18, 2007
  4. 3/4 Mention the parameters that git-pull would need to be equivalent to a --track in the git-checkout docsFederico Mena Quintero, Sep 18, 2007
  5. Junio C HamanoSep 18, 2007
  6. 0/4 Another round of the --track patchesFederico Mena Quintero, Oct 2, 2007
  7. 1/4 Say when --track is useful in the git-checkout docs.Federico Mena Quintero, Oct 2, 2007
  8. 1/4 Add documentation for --track and --no-track to the git-branch docs.Federico Mena Quintero, Oct 2, 2007
  9. Federico Mena QuinteroOct 2, 2007
  10. 3/4 Note that git-branch will not automatically checkout the new branchFederico Mena Quintero, Oct 2, 2007
  11. 4/4 Make git-pull complain and give advice when there is nothing to pull fromFederico Mena Quintero, Oct 2, 2007
  12. 4/4 Make git-pull give hints on what to do when there is no branch to merge fromFederico Mena Quintero, Sep 18, 2007
  13. Junio C HamanoSep 18, 2007

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.