diff options
| author | Jonathan Nieder <jrnieder@gmail.com> | 2009-10-09 14:16:15 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-10-10 01:40:25 +0400 |
| commit | 0f8a02c640397ce22080e1c2eaa5029388638589 (patch) | |
| tree | d3d296ecff6f3d7d4c9e1d1c39f79f6da501c0b1 /Documentation/git-merge.txt | |
| parent | 162213d2329d5e87f9b74ed8153ce7008788d213 (diff) | |
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>
Diffstat (limited to 'Documentation/git-merge.txt')
| -rw-r--r-- | Documentation/git-merge.txt | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt index af68d694a0..ac9f17a11e 100644 --- a/Documentation/git-merge.txt +++ b/Documentation/git-merge.txt @@ -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 |