diff options
author | Junio C Hamano <junio@hera.kernel.org> | 2009-10-10 00:56:29 +0000 |
---|---|---|
committer | Junio C Hamano <junio@hera.kernel.org> | 2009-10-10 00:56:29 +0000 |
commit | c0e55e76f42a06dfbb4ede27d35f6bdb8cae1f01 (patch) | |
tree | 3d14a6b26152cf3e014eafe48918109b2cc7cbf4 /git-fmt-merge-msg.txt | |
parent | 0e5cb1e4d7480845f839da2ee71c267ee054f758 (diff) | |
download | git-htmldocs-c0e55e76f42a06dfbb4ede27d35f6bdb8cae1f01.tar.gz |
Autogenerated HTML docs for v1.6.5-rc3-35-g3340
Diffstat (limited to 'git-fmt-merge-msg.txt')
-rw-r--r-- | git-fmt-merge-msg.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/git-fmt-merge-msg.txt b/git-fmt-merge-msg.txt index 1c24796d6..a586950b4 100644 --- a/git-fmt-merge-msg.txt +++ b/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 ------- |