Documentation: remote tracking branch -> remote-tracking branch

This change was already done by 0e615b252f3 (Matthieu Moy, Tue Nov 2
2010, Replace "remote tracking" with "remote-tracking"), but new
instances of remote tracking (without dash) were introduced in the
meantime.

Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
Signed-off-by: Jeff King <peff@peff.net>

diff --git a/Documentation/git-clone.txt b/Documentation/git-clone.txt
index 6d98ef3d2ab8c8e63e026dbd7e242d3c3bc3c79a..7fefdb0384307d0029eb6016bdf37735e84ebdd8 100644 (file)
--- a/Documentation/git-clone.txt
+++ b/Documentation/git-clone.txt
@@ -196,9 +196,9 @@ objects from the source repository into a pack in the cloned repository.
        `--no-single-branch` is given to fetch the histories near the
        tips of all branches.
        Further fetches into the resulting repository will only update the
        `--no-single-branch` is given to fetch the histories near the
        tips of all branches.
        Further fetches into the resulting repository will only update the

-       remote tracking branch for the branch this option was used for the
+       remote-tracking branch for the branch this option was used for the

        initial cloning.  If the HEAD at the remote did not point at any
        initial cloning.  If the HEAD at the remote did not point at any

-       branch when `--single-branch` clone was made, no remote tracking
+       branch when `--single-branch` clone was made, no remote-tracking

        branch is created.
 
 --recursive::
        branch is created.
 
 --recursive::

diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt
index 20f9228511e82ac9ced81889bcc66f41504710a3..d34ea3c50bae192cf0f43c782662a48a3df18f8c 100644 (file)
--- a/Documentation/git-merge.txt
+++ b/Documentation/git-merge.txt
@@ -99,7 +99,7 @@ commit or stash your changes before running 'git merge'.
        more than two parents (affectionately called an Octopus merge).
 +
 If no commit is given from the command line, and if `merge.defaultToUpstream`
        more than two parents (affectionately called an Octopus merge).
 +
 If no commit is given from the command line, and if `merge.defaultToUpstream`

-configuration variable is set, merge the remote tracking branches
+configuration variable is set, merge the remote-tracking branches

 that the current branch is configured to use as its upstream.
 See also the configuration section of this manual page.
 
 that the current branch is configured to use as its upstream.
 See also the configuration section of this manual page.
 

diff --git a/Documentation/git-push.txt b/Documentation/git-push.txt
index cb97cc1c3b44d2b5201af8593e593a08bd36855e..7938314b6978ec5d496209b26ee8c97b41704a30 100644 (file)
--- a/Documentation/git-push.txt
+++ b/Documentation/git-push.txt
@@ -172,7 +172,7 @@ useful if you write an alias or script around 'git push'.
 
 --recurse-submodules=check|on-demand::
        Make sure all submodule commits used by the revisions to be
 
 --recurse-submodules=check|on-demand::
        Make sure all submodule commits used by the revisions to be

-       pushed are available on a remote tracking branch. If 'check' is
+       pushed are available on a remote-tracking branch. If 'check' is

        used git will verify that all submodule commits that changed in
        the revisions to be pushed are available on at least one remote
        of the submodule. If any commits are missing the push will be
        used git will verify that all submodule commits that changed in
        the revisions to be pushed are available on at least one remote
        of the submodule. If any commits are missing the push will be

diff --git a/Documentation/merge-config.txt b/Documentation/merge-config.txt
index 861bd6f55352a12db6d1d680508e1d02a8e90d12..9bb4956ccdbef507ab115ac19dfe8ad326afb7c2 100644 (file)
--- a/Documentation/merge-config.txt
+++ b/Documentation/merge-config.txt
@@ -9,11 +9,11 @@ merge.conflictstyle::
 merge.defaultToUpstream::
        If merge is called without any commit argument, merge the upstream
        branches configured for the current branch by using their last
 merge.defaultToUpstream::
        If merge is called without any commit argument, merge the upstream
        branches configured for the current branch by using their last

-       observed values stored in their remote tracking branches.
+       observed values stored in their remote-tracking branches.

        The values of the `branch.<current branch>.merge` that name the
        branches at the remote named by `branch.<current branch>.remote`
        are consulted, and then they are mapped via `remote.<remote>.fetch`
        The values of the `branch.<current branch>.merge` that name the
        branches at the remote named by `branch.<current branch>.remote`
        are consulted, and then they are mapped via `remote.<remote>.fetch`

-       to their corresponding remote tracking branches, and the tips of
+       to their corresponding remote-tracking branches, and the tips of

        these tracking branches are merged.
 
 merge.ff::
        these tracking branches are merged.
 
 merge.ff::