summaryrefslogtreecommitdiffstats
path: root/git-commit.txt
diff options
context:
space:
mode:
authorJunio C Hamano <junio@hera.kernel.org>2007-07-27 07:26:40 +0000
committerJunio C Hamano <junio@hera.kernel.org>2007-07-27 07:26:40 +0000
commitb968dbbd6a939fc1282a7837026e131ed921e122 (patch)
treeea2c6e3bfaa630641b319f06d7519955eaaebacb /git-commit.txt
parent6936156b92bf31acd8e14b74ddf5b83a59de50f6 (diff)
downloadgit-htmldocs-b968dbbd6a939fc1282a7837026e131ed921e122.tar.gz
Autogenerated HTML docs for v1.5.3-rc3-13-g7ab3
Diffstat (limited to 'git-commit.txt')
-rw-r--r--git-commit.txt5
1 files changed, 2 insertions, 3 deletions
diff --git a/git-commit.txt b/git-commit.txt
index 3f36c6782..627994eb9 100644
--- a/git-commit.txt
+++ b/git-commit.txt
@@ -78,9 +78,8 @@ OPTIONS
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. The
- template file may also be specified using the `commit.template`
- configuration variable.
+ the `-m` or `-F` options, this option has no effect. This
+ overrides the `commit.template` configuration variable.
-s|--signoff::
Add Signed-off-by line at the end of the commit message.