Subject: Re: [PATCH 03/10] Change remote tracking to remote-tracking in non-trivial places

From: Jonathan Nieder <[email-masked]>
Date: Thu, 28 Oct 2010 13:39:19 -0500

Matthieu Moy wrote:

> --- a/Documentation/everyday.txt
> +++ b/Documentation/everyday.txt
> @@ -180,12 +180,12 @@ directory; clone from it to start a repository on the satellite
>  machine.
>  <2> clone sets these configuration variables by default.
>  It arranges `git pull` to fetch and store the branches of mothership
> -machine to local `remotes/origin/*` tracking branches.
> +machine to local `remotes/origin/*` remote-tracking branches.
>  <3> arrange `git push` to push local `master` branch to
>  `remotes/satellite/master` branch of the mothership machine.
>  <4> push will stash our work away on `remotes/satellite/master`
> -tracking branch on the mothership machine.  You could use this as
> -a back-up method.
> +remote-tracking branch on the mothership machine.  You could use this
> +as a back-up method.
>  <5> on mothership machine, merge the work done on the satellite
>  machine into the master branch.

Just for the record: I still don't think this hunk fits with the rest
of the patch, and I think it just switches from one bad wording to
another.

This is the "Everyday git" document, one of the first pages a new user
might read.  Using jargon that does not explain itself (whether it is
"tracking branches" or "remote-tracking branches") is not really a
good idea.

Wouldn't it be possible to split this into a separate patch, so it
does not hold back the other "add hyphen" changes?