undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Documentation: remote tracking branch -> remote-tracking branch

Browse Source 
This change was already done by 0e615b252f (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>
This commit is contained in:
Matthieu Moy 2012-10-23 13:34:05 +02:00 committed by Jeff King
parent 7e2010537e
commit a6d3bde5af
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Documentation/git-clone.txt
View File

@ -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 `--no-single-branch` is given to fetch the histories near the
tips of all branches. tips of all branches.
Further fetches into the resulting repository will only update the 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. branch is created.
--recursive:: --recursive::

2
Documentation/git-merge.txt
View File

@ -99,7 +99,7 @@ commit or stash your changes before running 'git merge'.
more than two parents (affectionately called an Octopus merge). more than two parents (affectionately called an Octopus merge).
+ +
If no commit is given from the command line, and if `merge.defaultToUpstream` 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. that the current branch is configured to use as its upstream.
See also the configuration section of this manual page. See also the configuration section of this manual page.

2
Documentation/git-push.txt
View File

@ -172,7 +172,7 @@ useful if you write an alias or script around 'git push'.
--recurse-submodules=check|on-demand:: --recurse-submodules=check|on-demand::
Make sure all submodule commits used by the revisions to be 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 used git will verify that all submodule commits that changed in
the revisions to be pushed are available on at least one remote the revisions to be pushed are available on at least one remote
of the submodule. If any commits are missing the push will be of the submodule. If any commits are missing the push will be

4
Documentation/merge-config.txt
View File

@ -9,11 +9,11 @@ merge.conflictstyle::
merge.defaultToUpstream:: merge.defaultToUpstream::
If merge is called without any commit argument, merge the upstream If merge is called without any commit argument, merge the upstream
branches configured for the current branch by using their last 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 The values of the `branch.<current branch>.merge` that name the
branches at the remote named by `branch.<current branch>.remote` branches at the remote named by `branch.<current branch>.remote`
are consulted, and then they are mapped via `remote.<remote>.fetch` 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. these tracking branches are merged.
merge.ff:: merge.ff::