git-commit.txt: clarify -t requires editing message

Make it clear that, when using commit --template, the message *must* be
changed or the commit will be aborted.

Helped-by: Junio C Hamano <gitster@pobox.com>
Helped-by: Ivan Heffner <iheffner@gmail.com>
Signed-off-by: Adam Monsen <haircut@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt
index 5cc84a139133dca2fdcb594007c8b0d6464d5ca8..f584a6214fa41f7c06c8a779cdfd7f4a6da9db62 100644 (file)
--- a/Documentation/git-commit.txt
+++ b/Documentation/git-commit.txt
@@ -132,11 +132,11 @@ OPTIONS
 
 -t <file>::
 --template=<file>::
-       Use the contents of the given file as the initial version
-       of the commit message. The editor is invoked and you can
-       make subsequent changes. If a message is specified using
-       the `-m` or `-F` options, this option has no effect. This
-       overrides the `commit.template` configuration variable.
+       Use the contents of the given file as the initial version of the
+       commit message. The editor is invoked so you can make subsequent
+       changes. If you make no changes, the commit is aborted. If a message
+       is specified using the `-m` or `-F` options, this option has no
+       effect. This overrides the `commit.template` configuration variable.
 
 -s::
 --signoff::