Merge branch 'fixes'

diff --git a/Documentation/git-add.txt b/Documentation/git-add.txt
index ae1ea762f5fb398a444305e5b4394f2f0a63a2bb..32300297d6b04f71679b6052945a4c77a7fc640b 100644 (file)
--- a/Documentation/git-add.txt
+++ b/Documentation/git-add.txt
@@ -7,11 +7,11 @@ git-add - Add files to the cache.
 
 SYNOPSIS
 --------
-'git-add' <file>...
+'git-add' [-n] [-v] <file>...
 
 DESCRIPTION
 -----------
-A simple wrapper to git-update-index to add files to the cache for people used
+A simple wrapper for git-update-index to add files to the cache for people used
 to do "cvs add".
 
 OPTIONS
@@ -19,6 +19,13 @@ OPTIONS
 <file>...::
        Files to add to the cache.
 
+-n::
+        Don't actually add the file(s), just show if they exist.
+
+-v::
+        Be verbose.
+
+
 Author
 ------
 Written by Linus Torvalds <torvalds@osdl.org>