diff options
author | Junio C Hamano <gitster@pobox.com> | 2011-04-02 04:57:16 +0400 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2011-04-02 04:57:16 +0400 |
commit | ffc5e3c958b66fb4babeba01483cc924bc2957a5 (patch) | |
tree | 4cea1fc19bb4b720d04ac102c2a30f6dec864679 /Documentation/git-merge.txt | |
parent | b966427b53b246e722df1e5502b9145eb9dd063a (diff) | |
parent | 93e535a5b78c9861eca3e9371d1c3e5173c0ab02 (diff) |
Merge branch 'jc/merge-sans-branch'
* jc/merge-sans-branch:
merge: merge with the default upstream branch without argument
merge: match the help text with the documentation
Conflicts:
builtin/merge.c
Diffstat (limited to 'Documentation/git-merge.txt')
-rw-r--r-- | Documentation/git-merge.txt | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt index fb4c05b83f..e2e6aba17e 100644 --- a/Documentation/git-merge.txt +++ b/Documentation/git-merge.txt @@ -11,7 +11,7 @@ SYNOPSIS [verse] 'git merge' [-n] [--stat] [--no-commit] [--squash] [-s <strategy>] [-X <strategy-option>] - [--[no-]rerere-autoupdate] [-m <msg>] <commit>... + [--[no-]rerere-autoupdate] [-m <msg>] [<commit>...] 'git merge' <msg> HEAD <commit>... 'git merge' --abort @@ -95,8 +95,13 @@ commit or stash your changes before running 'git merge'. <commit>...:: Commits, usually other branch heads, to merge into our branch. - You need at least one <commit>. Specifying more than one - <commit> obviously means you are trying an Octopus. + 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. +See also the configuration section of this manual page. PRE-MERGE CHECKS |