Skip to content

Commit 0f8a02c

Browse files
jrngitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 162213d commit 0f8a02c

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

Documentation/git-fmt-merge-msg.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ Takes the list of merged objects on stdin and produces a suitable
1818
commit message to be used for the merge commit, usually to be
1919
passed as the '<merge-message>' argument of 'git-merge'.
2020

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'.
2323

2424
OPTIONS
2525
-------

Documentation/git-merge.txt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,10 @@ OPTIONS
2828
include::merge-options.txt[]
2929

3030
-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.
3435

3536
<remote>...::
3637
Other branch heads to merge into our branch. You need at

0 commit comments

Comments
 (0)