diff options
| author | Jonathan Nieder <jrnieder@gmail.com> | 2009-10-09 05:16:15 -0500 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-10-09 14:40:25 -0700 |
| commit | 0f8a02c640397ce22080e1c2eaa5029388638589 (patch) | |
| tree | d3d296ecff6f3d7d4c9e1d1c39f79f6da501c0b1 /Documentation | |
| parent | 162213d2329d5e87f9b74ed8153ce7008788d213 (diff) | |
| download | git-0f8a02c640397ce22080e1c2eaa5029388638589.tar.gz git-0f8a02c640397ce22080e1c2eaa5029388638589.tar.xz | |
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')
| -rw-r--r-- | Documentation/git-fmt-merge-msg.txt | 4 | ||||
| -rw-r--r-- | Documentation/git-merge.txt | 7 |
2 files changed, 6 insertions, 5 deletions
diff --git a/Documentation/git-fmt-merge-msg.txt b/Documentation/git-fmt-merge-msg.txt index 1c24796d6..a586950b4 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 ------- diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt index af68d694a..ac9f17a11 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 |