Merge branch 'mm/maint-doc-remote-tracking' into maint
Update "remote tracking branch" in the documentation to "remote-tracking branch". * mm/maint-doc-remote-tracking: Documentation: remote tracking branch -> remote-tracking branch
This commit is contained in:
commit
78ba7e267c
@ -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
|
||||
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
|
||||
branch when `--single-branch` clone was made, no remote tracking
|
||||
branch when `--single-branch` clone was made, no remote-tracking
|
||||
branch is created.
|
||||
|
||||
--recursive::
|
||||
|
@ -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`
|
||||
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.
|
||||
|
||||
|
@ -175,7 +175,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
|
||||
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
|
||||
|
@ -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
|
||||
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`
|
||||
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::
|
||||
|
Loading…
Reference in New Issue
Block a user