Merge branch 'js/wrap-log'

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

diff --git a/Documentation/git-add.txt b/Documentation/git-add.txt
index 8710b3a75e0bfb7d0643a25ee7b9548ea5b01261..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
 --------
 
 SYNOPSIS
 --------

-'git-add' [-n] [-v] [--interactive] [--] <file>...
+'git-add' [-n] [-v] [-f] [--interactive | -i] [--] <file>...

 
 DESCRIPTION
 -----------
 
 DESCRIPTION
 -----------


@@ -25,8 +25,10 @@ the commit.
 The 'git status' command can be used to obtain a summary of what is included
 for the next commit.
 
 The 'git status' command can be used to obtain a summary of what is included
 for the next commit.
 

-This command only adds non-ignored files, to add ignored files use
-"git update-index --add".
+This command can be used to add ignored files with `-f` (force)
+option, but they have to be
+explicitly and exactly specified from the command line.  File globbing
+and recursive behaviour do not add ignored files.

 
 Please see gitlink:git-commit[1] for alternative ways to add content to a
 commit.
 
 Please see gitlink:git-commit[1] for alternative ways to add content to a
 commit.


@@ -35,7 +37,11 @@ commit.
 OPTIONS
 -------
 <file>...::
 OPTIONS
 -------
 <file>...::

-       Files to add content from.
+       Files to add content from.  Fileglobs (e.g. `*.c`) can
+       be given to add all matching files.  Also a
+       leading directory name (e.g. `dir` to add `dir/file1`
+       and `dir/file2`) can be given to add all files in the
+       directory, recursively.

 
 -n::
         Don't actually add the file(s), just show if they exist.
 
 -n::
         Don't actually add the file(s), just show if they exist.


@@ -43,7 +49,10 @@ OPTIONS
 -v::
         Be verbose.
 
 -v::
         Be verbose.
 

-\--interactive::
+-f::
+       Allow adding otherwise ignored files.
+
+-i, \--interactive::

        Add modified contents in the working tree interactively to
        the index.
 
        Add modified contents in the working tree interactively to
        the index.
 


@@ -74,7 +83,7 @@ git-add git-*.sh::
 Interactive mode
 ----------------
 When the command enters the interactive mode, it shows the
 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
 interactive command loop.
 
 The command loop shows the list of subcommands available, and