1. Stefan Saasen
  2. git


Petr Baudis  committed 3c64314

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>

  • Participants
  • Parent commits e3a3900
  • Branches master

Comments (0)

Files changed (2)

File Documentation/git-fmt-merge-msg.txt

View file
+git-fmt-merge-msg - Produce a merge commit message
+'git-fmt-merge-msg' <$GIT_DIR/FETCH_HEAD
+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`.
+Written by Junio C Hamano <junkio@cox.net>
+Documentation by Petr Baudis, Junio C Hamano and the git-list <git@vger.kernel.org>.
+Part of the gitlink:git[7] suite

File Documentation/git-merge.txt

View file
 	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.
 	obviously means you are trying an Octopus.
 Written by Junio C Hamano <junkio@cox.net>