diff options
| author | Junio C Hamano <junio@kernel.org> | 2011-04-02 04:32:29 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@kernel.org> | 2011-04-02 04:32:29 +0000 |
| commit | a03ac8675725e0f73e11b08ca9d7d395d1a16d15 (patch) | |
| tree | bfaec069d94d13e788e149166c68f4e87773c6d6 /git-merge.txt | |
| parent | f2873fdaeac7a9222349346775417f7325801664 (diff) | |
| download | git-htmldocs-a03ac8675725e0f73e11b08ca9d7d395d1a16d15.tar.gz | |
Autogenerated HTML docs for v1.7.5-rc0-96-gc4b2c
Diffstat (limited to 'git-merge.txt')
| -rw-r--r-- | git-merge.txt | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/git-merge.txt b/git-merge.txt index fb4c05b83..e2e6aba17 100644 --- a/git-merge.txt +++ b/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 |