File tree Expand file tree Collapse file tree 4 files changed +6
-6
lines changed Expand file tree Collapse file tree 4 files changed +6
-6
lines changed Original file line number Diff line number Diff line change @@ -196,9 +196,9 @@ objects from the source repository into a pack in the cloned repository.
196
196
`--no-single-branch` is given to fetch the histories near the
197
197
tips of all branches.
198
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
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
202
branch is created.
203
203
204
204
--recursive::
Original file line number Diff line number Diff line change @@ -99,7 +99,7 @@ commit or stash your changes before running 'git merge'.
99
99
more than two parents (affectionately called an Octopus merge).
100
100
+
101
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
103
that the current branch is configured to use as its upstream.
104
104
See also the configuration section of this manual page.
105
105
Original file line number Diff line number Diff line change @@ -175,7 +175,7 @@ useful if you write an alias or script around 'git push'.
175
175
176
176
--recurse-submodules=check|on-demand::
177
177
Make sure all submodule commits used by the revisions to be
178
- pushed are available on a remote tracking branch. If 'check' is
178
+ pushed are available on a remote- tracking branch. If 'check' is
179
179
used git will verify that all submodule commits that changed in
180
180
the revisions to be pushed are available on at least one remote
181
181
of the submodule. If any commits are missing the push will be
Original file line number Diff line number Diff line change @@ -9,11 +9,11 @@ merge.conflictstyle::
9
9
merge.defaultToUpstream::
10
10
If merge is called without any commit argument, merge the upstream
11
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
13
The values of the `branch.<current branch>.merge` that name the
14
14
branches at the remote named by `branch.<current branch>.remote`
15
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
17
these tracking branches are merged.
18
18
19
19
merge.ff::
You can’t perform that action at this time.
0 commit comments