{"thread":{"id":"2294","subject":"[PATCH] Documentation for git-fmt-merge-msg","startedAt":"2005-11-01T20:45:55Z","lastAt":"2005-11-01T20:45:55Z","messageCount":1,"participants":["Petr Baudis"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"10945","messageId":"20051101204555.19131.90275.stgit@machine.or.cz","threadId":"2294","inReplyTo":null,"subject":"[PATCH] Documentation for git-fmt-merge-msg","fromName":"Petr Baudis","fromEmail":"pasky@suse.cz","sentAt":"2005-11-01T20:45:55Z","receivedAt":"2005-11-01T20:45:55Z","isPatch":true,"sender":{"key":"pasky@ucw.cz","avatar":"https://avatars.githubusercontent.com/u/18439?v=4"},"body":"Simple description. It appears to be mostly internal command, but hey, it\nis (it seems) the only undocumented one, so let's fix it up...\n\nAlso add a note about it to git-merge documentation.\n\nSigned-off-by: Petr Baudis <pasky@suse.cz>\n---\n\n Documentation/git-fmt-merge-msg.txt |   39 +++++++++++++++++++++++++++++++++++\n Documentation/git-merge.txt         |   10 +++++++++\n 2 files changed, 49 insertions(+), 0 deletions(-)\n\ndiff --git a/Documentation/git-fmt-merge-msg.txt b/Documentation/git-fmt-merge-msg.txt\nnew file mode 100644\nindex 0000000..a70eb39\n--- /dev/null\n+++ b/Documentation/git-fmt-merge-msg.txt\n@@ -0,0 +1,39 @@\n+git-fmt-merge-msg(1)\n+====================\n+\n+NAME\n+----\n+git-fmt-merge-msg - Produce a merge commit message\n+\n+\n+SYNOPSIS\n+--------\n+'git-fmt-merge-msg' <$GIT_DIR/FETCH_HEAD\n+\n+DESCRIPTION\n+-----------\n+Takes the list of merged objects on stdin and produces a suitable\n+commit message to be used for the merge commit, usually to be\n+passed as the '<merge-message>' argument of `git-merge`.\n+\n+This script is intended mostly for internal use by scripts\n+automatically invoking `git-merge`.\n+\n+\n+SEE ALSO\n+--------\n+gitlink:git-merge[1]\n+\n+\n+Author\n+------\n+Written by Junio C Hamano <junkio@cox.net>\n+\n+Documentation\n+--------------\n+Documentation by Petr Baudis, Junio C Hamano and the git-list <git@vger.kernel.org>.\n+\n+GIT\n+---\n+Part of the gitlink:git[7] suite\n+\ndiff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt\nindex a007a8b..8c9c4d8 100644\n--- a/Documentation/git-merge.txt\n+++ b/Documentation/git-merge.txt\n@@ -28,6 +28,11 @@ OPTIONS\n \tthere is no `-s` option, built-in list of strategies is\n \tused instead.\n \n+<msg>::\n+\tThe commit message to be used for the merge commit (in case\n+\tit is created). The `git-fmt-merge-msg` script can be used\n+\tto give a good default for automated `git-merge` invocations.\n+\n <head>::\n \tour branch head commit.\n \n@@ -37,6 +42,11 @@ OPTIONS\n \tobviously means you are trying an Octopus.\n \n \n+SEE ALSO\n+--------\n+gitlink:git-fmt-merge-msg[1]\n+\n+\n Author\n ------\n Written by Junio C Hamano <junkio@cox.net>\n"}]}