Merge lt/revlist,jc/diff,jc/revparse,jc/abbrev

diff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt
index b92cf483152d7d393b20537d5407479aa13fefc1..72f96fcfd53d836a8c62d51540762d48d6649863 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
 -----------
@@ -23,7 +25,9 @@ information.
 OPTIONS
 -------
 -a|--all::
-       Update all paths in the index file.
+       Update all paths in the index file.  This flag notices
+       files that have been modified and deleted, but new files
+       you have not told git about are not affected.
 
 -c or -C <commit>::
        Take existing commit object, and reuse the log message
@@ -66,6 +70,10 @@ OPTIONS
        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