summaryrefslogtreecommitdiff
path: root/Documentation/git-fmt-merge-msg.txt
diff options
context:
space:
mode:
authorPetr Baudis <pasky@suse.cz>2005-11-01 20:45:55 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-11-01 22:45:49 (GMT)
commit3c64314c4b1f90488391a0ffea2a4ed04c8f6b79 (patch)
tree84b5ed3295ea3f148194061c8475e348d3793769 /Documentation/git-fmt-merge-msg.txt
parente3a39000e295e4bd6faff97decc31e6cb4520bb1 (diff)
downloadgit-3c64314c4b1f90488391a0ffea2a4ed04c8f6b79.zip
git-3c64314c4b1f90488391a0ffea2a4ed04c8f6b79.tar.gz
git-3c64314c4b1f90488391a0ffea2a4ed04c8f6b79.tar.bz2
Documentation for git-fmt-merge-msg
Simple description. It appears to be mostly internal command, but hey, it is (it seems) the only undocumented one, so let's fix it up... Also add a note about it to git-merge documentation. Signed-off-by: Petr Baudis <pasky@suse.cz> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation/git-fmt-merge-msg.txt')
-rw-r--r--Documentation/git-fmt-merge-msg.txt39
1 files changed, 39 insertions, 0 deletions
diff --git a/Documentation/git-fmt-merge-msg.txt b/Documentation/git-fmt-merge-msg.txt
new file mode 100644
index 0000000..a70eb39
--- /dev/null
+++ b/Documentation/git-fmt-merge-msg.txt
@@ -0,0 +1,39 @@
+git-fmt-merge-msg(1)
+====================
+
+NAME
+----
+git-fmt-merge-msg - Produce a merge commit message
+
+
+SYNOPSIS
+--------
+'git-fmt-merge-msg' <$GIT_DIR/FETCH_HEAD
+
+DESCRIPTION
+-----------
+Takes the list of merged objects on stdin and produces a suitable
+commit message to be used for the merge commit, usually to be
+passed as the '<merge-message>' argument of `git-merge`.
+
+This script is intended mostly for internal use by scripts
+automatically invoking `git-merge`.
+
+
+SEE ALSO
+--------
+gitlink:git-merge[1]
+
+
+Author
+------
+Written by Junio C Hamano <junkio@cox.net>
+
+Documentation
+--------------
+Documentation by Petr Baudis, Junio C Hamano and the git-list <git@vger.kernel.org>.
+
+GIT
+---
+Part of the gitlink:git[7] suite
+