projects / thirdparty / git.git / blame
| Commit | Line | Data |
|---|---|---|
| 0f69be53 JH |
1 | git-merge(1) |
| 2 | ============ | |
| 0f69be53 JH |
3 | |
| 4 | NAME | |
| 5 | ---- | |
| 6 | git-merge - Grand Unified Merge Driver | |
| 7 | ||
| 8 | ||
| 9 | SYNOPSIS | |
| 10 | -------- | |
| 37465016 | 11 | 'git-merge' [-n] [--no-commit] [-s <strategy>]... <msg> <head> <remote> <remote>... |
| 0f69be53 JH |
12 | |
| 13 | ||
| 14 | DESCRIPTION | |
| 15 | ----------- | |
| 16 | This is the top-level user interface to the merge machinery | |
| 17 | which drives multiple merge strategy scripts. | |
| 18 | ||
| 19 | ||
| 20 | OPTIONS | |
| 21 | ------- | |
| 93d69d86 | 22 | include::merge-options.txt[] |
| 0f69be53 | 23 | |
| 3c64314c PB |
24 | <msg>:: |
| 25 | The commit message to be used for the merge commit (in case | |
| 26 | it is created). The `git-fmt-merge-msg` script can be used | |
| 27 | to give a good default for automated `git-merge` invocations. | |
| 28 | ||
| 0f69be53 JH |
29 | <head>:: |
| 30 | our branch head commit. | |
| 31 | ||
| 32 | <remote>:: | |
| 33 | other branch head merged into our branch. You need at | |
| 34 | least one <remote>. Specifying more than one <remote> | |
| 35 | obviously means you are trying an Octopus. | |
| 36 | ||
| bb73d73c JL |
37 | include::merge-strategies.txt[] |
| 38 | ||
| 0f69be53 | 39 | |
| 3c64314c PB |
40 | SEE ALSO |
| 41 | -------- | |
| fdd08979 | 42 | gitlink:git-fmt-merge-msg[1], gitlink:git-pull[1] |
| 3c64314c PB |
43 | |
| 44 | ||
| 0f69be53 JH |
45 | Author |
| 46 | ------ | |
| 47 | Written by Junio C Hamano <junkio@cox.net> | |
| 48 | ||
| 49 | ||
| 50 | Documentation | |
| 51 | -------------- | |
| 52 | Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>. | |
| 53 | ||
| 54 | GIT | |
| 55 | --- | |
| a7154e91 | 56 | Part of the gitlink:git[7] suite |