Documentation: git fmt-merge-msg does not have to be a script
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>
Jonathan Nieder committed
Oct 9, 2009 at 05:16 UTC
0f8a02c640397ce22080e1c2eaa5029388638589
2 files changed
+6
-5
Documentation/git-fmt-merge-msg.txt
+2
-2
@@ -18,8 +18,8 @@ Takes the list of merged objects on stdin and produces a suitable
18
commit message to be used for the merge commit, usually to be
19
passed as the '<merge-message>' argument of 'git-merge'.
20
21
-This script is intended mostly for internal use by scripts
22
-automatically invoking 'git-merge'.
21
+This command is intended mostly for internal use by scripts
22
+automatically invoking 'git merge'.
23
24
OPTIONS
25
-------
Documentation/git-merge.txt
+4
-3
@@ -28,9 +28,10 @@ OPTIONS
28
include::merge-options.txt[]
29
30
-m <msg>::
31
- The commit message to be used for the merge commit (in case
32
- it is created). The 'git-fmt-merge-msg' script can be used
33
- to give a good default for automated 'git-merge' invocations.
31
+ Set the commit message to be used for the merge commit (in
32
+ case one is created). The 'git fmt-merge-msg' command can be
33
+ used to give a good default for automated 'git merge'
34
+ invocations.
35
36
<remote>...::
37
Other branch heads to merge into our branch. You need at