diff options
author | Adam Monsen <haircut@gmail.com> | 2012-03-31 12:28:15 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2012-04-01 15:20:38 -0700 |
commit | b0ad5e27803cd599e629b1a64b74ac4bffb3962d (patch) | |
tree | 42e4f6b6970c7b8c17dcd65b22edd373503abf21 /Documentation/git-commit.txt | |
parent | commit: rephrase the error when user did not touch templated log message (diff) | |
download | tgif-b0ad5e27803cd599e629b1a64b74ac4bffb3962d.tar.xz |
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>
Diffstat (limited to 'Documentation/git-commit.txt')
-rw-r--r-- | Documentation/git-commit.txt | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt index 5cc84a1391..f584a6214f 100644 --- 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:: |