X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=Documentation%2Fgit-merge.txt;h=8c9c4d87e359041b8f10b2ec5f13ee4217fae3bc;hb=6ddc0964034342519a87fe013781abf31c6db6ad;hp=dca363dd5ec7022d605d5730be65e6066072de1d;hpb=7fe2fc79358673a909d71e62d3f80ffe0f525fce;p=git.git diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt index dca363dd..8c9c4d87 100644 --- a/Documentation/git-merge.txt +++ b/Documentation/git-merge.txt @@ -1,6 +1,5 @@ git-merge(1) ============ -v0.99.6, Sep 2005 NAME ---- @@ -29,6 +28,11 @@ OPTIONS 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. @@ -38,6 +42,11 @@ OPTIONS obviously means you are trying an Octopus. +SEE ALSO +-------- +gitlink:git-fmt-merge-msg[1] + + Author ------ Written by Junio C Hamano