undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Documentation: git fmt-merge-msg does not have to be a script

Browse Source 
The fmt-merge-message builtin can be invoked as "git fmt-merge-msg" rather
than through the hard link in GIT_EXEC_PATH.  Although this is unlikely to
confuse most script writers, it should not hurt to make the documentation
a little clearer anyway.

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jonathan Nieder 2009-10-09 05:16:15 -05:00 committed by Junio C Hamano
parent 162213d232
commit 0f8a02c640
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -18,8 +18,8 @@ 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'.
This command is intended mostly for internal use by scripts
automatically invoking 'git merge'.
OPTIONS
-------

7
Documentation/git-merge.txt
View File

@ -28,9 +28,10 @@ OPTIONS
include::merge-options.txt[]
-m <msg>::
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.
Set the commit message to be used for the merge commit (in
case one is created). The 'git fmt-merge-msg' command can be
used to give a good default for automated 'git merge'
invocations.
<remote>...::
Other branch heads to merge into our branch. You need at