git-am support for naked email messages (take 2)

diff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt
index 790a8eb0ddf13146dde12bf944e998ef778bde5a..b92cf483152d7d393b20537d5407479aa13fefc1 100644 (file)
--- a/Documentation/git-commit.txt
+++ b/Documentation/git-commit.txt
@@ -1,6 +1,5 @@
 git-commit(1)
 =============
-v0.99.4, Aug 2005
 
 NAME
 ----
@@ -8,7 +7,7 @@ git-commit - Record your changes
 
 SYNOPSIS
 --------
-'git commit' [-a] [-s] [-v] [(-c | -C) <commit> | -F <file> | -m <msg>] [-e] <file>...
+'git-commit' [-a] [-s] [-v] [(-c | -C) <commit> | -F <file> | -m <msg>] [-e] [--] <file>...
 
 DESCRIPTION
 -----------
@@ -23,7 +22,7 @@ information.
 
 OPTIONS
 -------
--a::
+-a|--all::
        Update all paths in the index file.
 
 -c or -C <commit>::
@@ -40,23 +39,29 @@ OPTIONS
 -m <msg>::
        Use the given <msg> as the commit message.
 
--s::
+-s|--signoff::
        Add Signed-off-by line at the end of the commit message.
 
--v::
+-v|--verify::
        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.
+       character.  This is the default.
 
--e::
+-n|--no-verify::
+       The opposite of `--verify`.
+
+-e|--edit::
        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.
 
+--::
+       Do not interpret any more arguments as options.
+
 <file>...::
        Update specified paths in the index file before committing.