summaryrefslogtreecommitdiff
path: root/Documentation/git-fmt-merge-msg.txt
diff options
context:
space:
mode:
authorJonathan Nieder <jrnieder@gmail.com>2009-10-09 10:16:15 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-10-09 21:40:25 (GMT)
commit0f8a02c640397ce22080e1c2eaa5029388638589 (patch)
treed3d296ecff6f3d7d4c9e1d1c39f79f6da501c0b1 /Documentation/git-fmt-merge-msg.txt
parent162213d2329d5e87f9b74ed8153ce7008788d213 (diff)
downloadgit-0f8a02c640397ce22080e1c2eaa5029388638589.zip
git-0f8a02c640397ce22080e1c2eaa5029388638589.tar.gz
git-0f8a02c640397ce22080e1c2eaa5029388638589.tar.bz2
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-fmt-merge-msg.txt')
-rw-r--r--Documentation/git-fmt-merge-msg.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/git-fmt-merge-msg.txt b/Documentation/git-fmt-merge-msg.txt
index 1c24796..a586950 100644
--- a/Documentation/git-fmt-merge-msg.txt
+++ b/Documentation/git-fmt-merge-msg.txt
@@ -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
-------