Merge branch 'maint' of git://repo.or.cz/git-gui into maint

diff --git a/Documentation/git-add.txt b/Documentation/git-add.txt
index a5051aad6bfdf748976430452206e40838c75ca6..755d7186f5f4a74dc84cc98c67eec0b9c86b6289 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] [--] <file>...
 
 DESCRIPTION
 -----------
@@ -52,7 +52,7 @@ OPTIONS
 -f::
        Allow adding otherwise ignored files.
 
-\--interactive::
+-i, \--interactive::
        Add modified contents in the working tree interactively to
        the index.