X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=Documentation%2Fgit-merge.txt;h=3e058db996cbb1200fc304b3a090cbd4e13fce80;hb=26349b2e5ee2311cbb12db1cb92fa48fb0f26ef8;hp=a007a8b15a1a4598aabd844d09e45db65db6e3a5;hpb=d06b689a933f6d2130f8afdf1ac0ddb83eeb59ab;p=git.git diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt index a007a8b1..3e058db9 100644 --- a/Documentation/git-merge.txt +++ b/Documentation/git-merge.txt @@ -8,7 +8,7 @@ git-merge - Grand Unified Merge Driver SYNOPSIS -------- -'git-merge' [-n] [-s ]... ... +'git-merge' [-n] [--no-commit] [-s ]... ... DESCRIPTION @@ -19,14 +19,12 @@ which drives multiple merge strategy scripts. OPTIONS ------- --n:: - Do not show diffstat at the end of the merge. +include::merge-pull-opts.txt[] --s :: - use that merge strategy; can be given more than once to - specify them in the order they should be tried. If - there is no `-s` option, built-in list of strategies is - used instead. +:: + The commit message to be used for the merge commit (in case + it is created). The `git-fmt-merge-msg` script can be used + to give a good default for automated `git-merge` invocations. :: our branch head commit. @@ -37,6 +35,11 @@ OPTIONS obviously means you are trying an Octopus. +SEE ALSO +-------- +gitlink:git-fmt-merge-msg[1], gitlink:git-pull[1] + + Author ------ Written by Junio C Hamano