X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=Documentation%2Fgit-merge.txt;h=904e2fc4c5d1d2748e8f34b8df977a88f23233fd;hb=302ebfe52192fff9a2c1c612dff22325fd073acc;hp=dca363dd5ec7022d605d5730be65e6066072de1d;hpb=0493a3fd5204a36bc961a8611770ddb9ec1ed8ed;p=git.git diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt index dca363dd..904e2fc4 100644 --- a/Documentation/git-merge.txt +++ b/Documentation/git-merge.txt @@ -1,6 +1,5 @@ git-merge(1) ============ -v0.99.6, Sep 2005 NAME ---- @@ -9,7 +8,7 @@ git-merge - Grand Unified Merge Driver SYNOPSIS -------- -'git-merge' [-n] [-s ]... ... +'git-merge' [-n] [--no-commit] [-s ]... ... DESCRIPTION @@ -20,14 +19,12 @@ which drives multiple merge strategy scripts. OPTIONS ------- --n:: - Do not show diffstat at the end of the merge. +include::merge-options.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 +34,13 @@ 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-pull[1] + Author ------