Merge branch 'master' of .

[git.git] / Documentation / git-commit-script.txt

diff --git a/Documentation/git-commit-script.txt b/Documentation/git-commit-script.txt
index cf6b5c3da24278fa79885219f2699b6415f23eea..faa1870e34dc836683c45644b9470ecdf10c7f8c 100644 (file)
--- a/Documentation/git-commit-script.txt
+++ b/Documentation/git-commit-script.txt
@@ -8,7 +8,7 @@ git-commit-script - Record your changes
 
 SYNOPSIS
 --------
-'git commit' [-a] [-s] [-v] [(-c | -C) <commit> | -F <file> | -m <msg>] <file>...
+'git commit' [-a] [-s] [-v] [(-c | -C) <commit> | -F <file> | -m <msg>] [-e] <file>...
 
 DESCRIPTION
 -----------
@@ -17,6 +17,10 @@ Updates the index file for given paths, or all modified files if
 VISUAL and EDITOR environment variables to edit the commit log
 message.
 
+This command can run `commit-msg`, `pre-commit`, and
+`post-commit` hooks.  See link:hooks.html[hooks] for more
+information.
+
 OPTIONS
 -------
 -a::
@@ -47,8 +51,14 @@ OPTIONS
        has a SP character immediately followed by a TAB
        character.
 
+-e::
+       The message taken from file with `-F`, command line with
+       `-m`, and from file with `-C` are usually used as the
+       commit log message unmodified.  This option lets you
+       further edit the message taken from these sources.
+
 <file>...::
-       Update specified paths in the index file.
+       Update specified paths in the index file before committing.
 
 
 Author