X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fgit-fmt-merge-msg.txt;h=a585dbe898171ddb8a205cc5a898d695540f80a6;hb=cf87463e79a3018f666bfc9af113d3eea58a3d82;hp=a586950b48bac6eda630383714c0ccd1b28820a8;hpb=03c6e97f809e5b89089a2c689d6a319e8d471455;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'.