From: Jonathan Nieder Date: Fri, 09 Oct 2009 10:16:15 GMT Subject: [PATCH 2/9] Documentation: git fmt-merge-message is not a script Message-ID: <20091009101615.GB16558@progeny.tock> In-Reply-To: <20091009101400.GA16549@progeny.tock> The fmt-merge-message builtin is usually invoked as "git fmt-merge-message" 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 --- Documentation/git-fmt-merge-msg.txt | 2 +- Documentation/git-merge.txt | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Documentation/git-fmt-merge-msg.txt b/Documentation/git-fmt-merge-msg.txt index 1c24796..0067805 100644 --- a/Documentation/git-fmt-merge-msg.txt +++ b/Documentation/git-fmt-merge-msg.txt @@ -18,7 +18,7 @@ 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 '' argument of 'git-merge'. -This script is intended mostly for internal use by scripts +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 af68d69..354e9d9 100644 --- a/Documentation/git-merge.txt +++ b/Documentation/git-merge.txt @@ -28,9 +28,10 @@ OPTIONS include::merge-options.txt[] -m :: - 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 'fmt-merge-msg' Git command can be + used to give a good default for automated 'git-merge' + invocations. ...:: Other branch heads to merge into our branch. You need at -- 1.6.5.rc1.199.g596ec