Merge branch 'maint'

diff --git a/Documentation/git-add.txt b/Documentation/git-add.txt
index 95bea66374a6054ee6823b760dbc73d5b84cd5a0..ea2701846f3b9f2ddd86942223df65872a70b64f 100644 (file)
--- a/Documentation/git-add.txt
+++ b/Documentation/git-add.txt
@@ -7,7 +7,7 @@ git-add - Add file contents to the changeset to be committed next
 
 SYNOPSIS
 --------
-'git-add' [-n] [-v] [-f] [--interactive] [--] <file>...
+'git-add' [-n] [-v] [-f] [--interactive | -i] [-u] [--] <file>...
 
 DESCRIPTION
 -----------
@@ -52,10 +52,14 @@ OPTIONS
 -f::
        Allow adding otherwise ignored files.
 
-\--interactive::
+-i, \--interactive::
        Add modified contents in the working tree interactively to
        the index.
 
+-u::
+       Update all files that git already knows about. This is what
+       "git commit -a" does in preparation for making a commit.
+
 \--::
        This option can be used to separate command-line options from
        the list of files, (useful when filenames might be mistaken
@@ -83,7 +87,7 @@ git-add git-*.sh::
 Interactive mode
 ----------------
 When the command enters the interactive mode, it shows the
-output of the 'status' subcommand, and then goes into ints
+output of the 'status' subcommand, and then goes into its
 interactive command loop.
 
 The command loop shows the list of subcommands available, and