glossary: explain "master" and "origin"

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

diff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt
index 1edc278..e0ff74f 100644 (file)
--- a/Documentation/git-commit.txt
+++ b/Documentation/git-commit.txt
@@ -7,7 +7,9 @@ git-commit - Record your changes
 
 SYNOPSIS
 --------
-'git-commit' [-a] [-s] [-v] [(-c | -C) <commit> | -F <file> | -m <msg>] [-e] <file>...
+[verse]
+'git-commit' [-a] [-s] [-v] [(-c | -C) <commit> | -F <file> | -m <msg>]
+          [-e] [--] <file>...
 
 DESCRIPTION
 -----------
@@ -22,7 +24,7 @@ information.
 
 OPTIONS
 -------
--a::
+-a|--all::
        Update all paths in the index file.
 
 -c or -C <commit>::
@@ -39,27 +41,37 @@ 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.
 
 
+If you make a commit and then found a mistake immediately after
+that, you can recover from it with gitlink:git-reset[1].
+
+
 Author
 ------
 Written by Linus Torvalds <torvalds@osdl.org> and