Merge branch 'jc/fpl'

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

diff --git a/Documentation/git-add.txt b/Documentation/git-add.txt
index 2fef0681bfaf2155d667798eeb7d450fd1ccfcd8..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,7 +25,8 @@ 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 can be used to add ignored files, but they have to be
+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.
 
 explicitly and exactly specified from the command line.  File globbing
 and recursive behaviour do not add ignored files.
 


@@ -48,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.
 


@@ -79,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