Skip to content

Commit

Permalink
Documentation: git fmt-merge-msg does not have to be a script
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Jonathan Nieder authored and Junio C Hamano committed Oct 9, 2009
1 parent 162213d commit 0f8a02c
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 5 deletions.
4 changes: 2 additions & 2 deletions Documentation/git-fmt-merge-msg.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
-------
Expand Down
7 changes: 4 additions & 3 deletions Documentation/git-merge.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 0f8a02c

Please sign in to comment.