diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-06-03 15:15:13 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-06-03 15:15:13 -0700 |
| commit | b051caf02ee59e3c9d1da4a61339f667f28754d1 (patch) | |
| tree | 04b2ca42cc953959fa66006e8e750d26da86ea3e /git-merge.txt | |
| parent | 26aa6502e39e98238de17444d0d2a26999ea6445 (diff) | |
| download | git-htmldocs-b051caf02ee59e3c9d1da4a61339f667f28754d1.tar.gz | |
Autogenerated HTML docs for v2.0.0-153-g79dcc
Diffstat (limited to 'git-merge.txt')
| -rw-r--r-- | git-merge.txt | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/git-merge.txt b/git-merge.txt index a3c1fa332..cf2c374b7 100644 --- a/git-merge.txt +++ b/git-merge.txt @@ -101,9 +101,8 @@ commit or stash your changes before running 'git merge'. Specifying more than one commit will create a merge with 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 -that the current branch is configured to use as its upstream. +If no commit is given from the command line, 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. |