X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fgit-fmt-merge-msg.txt;h=a585dbe898171ddb8a205cc5a898d695540f80a6;hb=e09151281ded5e05ee64e67e5d20529953c23b65;hp=a586950b48bac6eda630383714c0ccd1b28820a8;hpb=35da43e9bb4a5d7542c2ee27e0a3557ac921e3ab;p=git.git diff --git a/Documentation/git-fmt-merge-msg.txt b/Documentation/git-fmt-merge-msg.txt index a586950b4..a585dbe89 100644 --- a/Documentation/git-fmt-merge-msg.txt +++ b/Documentation/git-fmt-merge-msg.txt @@ -16,7 +16,7 @@ DESCRIPTION ----------- 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'. +passed as the '' argument of 'git merge'. This command is intended mostly for internal use by scripts automatically invoking 'git merge'.