X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=Documentation%2Fgit-merge.txt;h=b3ef19bae44268a3a2159f9ccfbce51314312ab7;hb=72e5890b68e7199d92620d3bba91fa36dd259404;hp=8c9c4d87e359041b8f10b2ec5f13ee4217fae3bc;hpb=235d521da60e4699e5bd59ac658b5b48bd76ddca;p=git.git diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt index 8c9c4d87..b3ef19ba 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,7 @@ which drives multiple merge strategy scripts. OPTIONS ------- --n:: - Do not show diffstat at the end of the merge. - --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. +include::merge-pull-opts.txt[] :: The commit message to be used for the merge commit (in case @@ -41,10 +34,12 @@ OPTIONS least one . Specifying more than one obviously means you are trying an Octopus. +include::merge-strategies.txt[] + SEE ALSO -------- -gitlink:git-fmt-merge-msg[1] +gitlink:git-fmt-merge-msg[1], gitlink:git-pull[1] Author