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>
Matthieu Moy committed
Oct 23, 2012 at 13:34 UTC
a6d3bde5afc5d742af0d7b1f2725b760dca165cb
4 files changed
+6
-6
Documentation/git-clone.txt
+2
-2
@@ -196,9 +196,9 @@ objects from the source repository into a pack in the cloned repository.
196
`--no-single-branch` is given to fetch the histories near the
197
tips of all branches.
198
Further fetches into the resulting repository will only update the
199
- remote tracking branch for the branch this option was used for the
199
+ remote-tracking branch for the branch this option was used for the
200
initial cloning. If the HEAD at the remote did not point at any
201
- branch when `--single-branch` clone was made, no remote tracking
201
+ branch when `--single-branch` clone was made, no remote-tracking
202
branch is created.
203
204
--recursive::
Documentation/git-merge.txt
+1
-1
@@ -99,7 +99,7 @@ commit or stash your changes before running 'git merge'.
99
more than two parents (affectionately called an Octopus merge).
100
+
101
If no commit is given from the command line, and if `merge.defaultToUpstream`
102
-configuration variable is set, merge the remote tracking branches
102
+configuration variable is set, merge the remote-tracking branches
103
that the current branch is configured to use as its upstream.
104
See also the configuration section of this manual page.
105
Documentation/git-push.txt
+1
-1
@@ -172,7 +172,7 @@ useful if you write an alias or script around 'git push'.
172
173
--recurse-submodules=check|on-demand::
174
Make sure all submodule commits used by the revisions to be
175
- pushed are available on a remote tracking branch. If 'check' is
175
+ pushed are available on a remote-tracking branch. If 'check' is
176
used git will verify that all submodule commits that changed in
177
the revisions to be pushed are available on at least one remote
178
of the submodule. If any commits are missing the push will be
Documentation/merge-config.txt
+2
-2
@@ -9,11 +9,11 @@ merge.conflictstyle::
9
merge.defaultToUpstream::
10
If merge is called without any commit argument, merge the upstream
11
branches configured for the current branch by using their last
12
- observed values stored in their remote tracking branches.
12
+ observed values stored in their remote-tracking branches.
13
The values of the `branch.<current branch>.merge` that name the
14
branches at the remote named by `branch.<current branch>.remote`
15
are consulted, and then they are mapped via `remote.<remote>.fetch`
16
- to their corresponding remote tracking branches, and the tips of
16
+ to their corresponding remote-tracking branches, and the tips of
17
these tracking branches are merged.
18
19
merge.ff::