Merge with gitk --parents change.

diff --git a/Documentation/git-commit-script.txt b/Documentation/git-commit-script.txt
index bb559d70a51d92294dad2f2e3a8de9eeb2fabfe0..cf6b5c3da24278fa79885219f2699b6415f23eea 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] [(-c | -C) <commit> | -F <file> | -m <msg>] <file>...
+'git commit' [-a] [-s] [-v] [(-c | -C) <commit> | -F <file> | -m <msg>] <file>...
 
 DESCRIPTION
 -----------
@@ -36,13 +36,26 @@ OPTIONS
 -m <msg>::
        Use the given <msg> as the commit message.
 
+-s::
+       Add Signed-off-by line at the end of the commit message.
+
+-v::
+       Look for suspicious lines the commit introduces, and
+       abort committing if there is one.  The definition of
+       'suspicious lines' is currently the lines that has
+       trailing whitespaces, and the lines whose indentation
+       has a SP character immediately followed by a TAB
+       character.
+
 <file>...::
        Update specified paths in the index file.
 
 
 Author
 ------
-Written by Linus Torvalds <torvalds@osdl.org>
+Written by Linus Torvalds <torvalds@osdl.org> and
+Junio C Hamano <junkio@cox.net>
+
 
 GIT
 ---