From: Jonathan Nieder <jrnieder@gmail.com>
Date: Thu, 28 Oct 2010 19:56:41 GMT
Subject: Re: [PATCH 04/10] Change "tracking branch" to "remote-tracking branch"
Message-ID: <20101028195641.GB16006@burratino>
In-Reply-To: <1288290117-6734-5-git-send-email-Matthieu.Moy@imag.fr>

Matthieu Moy wrote:

> One more step towards consistancy. We change the documentation and the C
> code in a single patch, since the only instances in the C code are in
> comment and usage strings.

For what it's worth:
Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>

> --- a/Documentation/glossary-content.txt
> +++ b/Documentation/glossary-content.txt
> @@ -349,6 +349,14 @@ This commit is referred to as a "merge commit", or sometimes just a
>  	master branch head as to-upstream branch at $URL". See also
>  	linkgit:git-push[1].
>  
> +[[def_remote_tracking_branch]]remote-tracking branch::
> +	A regular git <<def_branch,branch>> that is used to follow changes from
> +	another <<def_repository,repository>>. A tracking
> +	branch should not contain direct modifications or have local commits
> +	made to it. A remote-tracking branch can usually be
> +	identified as the right-hand-side <<def_ref,ref>> in a Pull:
> +	<<def_refspec,refspec>>.
> +
>  [[def_repository]]repository::

In particular, your explanation for this hunk makes sense.  Any links
out in the world to "gitglossary.html#def_tracking_branch" would go to
the top of the page after this change.  Once there, the reader can
easily search for "tracking branch" to find the right entry.