X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=Documentation%2Fgit-merge.txt;h=8c9c4d87e359041b8f10b2ec5f13ee4217fae3bc;hb=3c64314c4b1f90488391a0ffea2a4ed04c8f6b79;hp=a007a8b15a1a4598aabd844d09e45db65db6e3a5;hpb=e3a39000e295e4bd6faff97decc31e6cb4520bb1;p=git.git diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt index a007a8b1..8c9c4d87 100644 --- a/Documentation/git-merge.txt +++ b/Documentation/git-merge.txt @@ -28,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. @@ -37,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