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>
maint
Adam Monsen 2012-03-31 12:28:15 -07:00 committed by Junio C Hamano
parent b2eda9bdfb
commit b0ad5e2780
1 changed files with 5 additions and 5 deletions

View File

@ -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::