Merge branch 'jc/post-simplify' (early part) into tr/filter-branch

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

diff --git a/Documentation/git-add.txt b/Documentation/git-add.txt
index 815864c37fb42dd6c859253aa219685fca242f47..2b6d6c86547b2cec370d34b14ddef25264404892 100644 (file)
--- a/Documentation/git-add.txt
+++ b/Documentation/git-add.txt
@@ -8,8 +8,8 @@ git-add - Add file contents to the index
 SYNOPSIS
 --------
 [verse]
 SYNOPSIS
 --------
 [verse]

-'git-add' [-n] [-v] [--force | -f] [--interactive | -i] [--patch | -p]
-         [--update | -u] [--refresh] [--ignore-errors] [--]
+'git add' [-n] [-v] [--force | -f] [--interactive | -i] [--patch | -p]
+         [--all | [--update | -u]] [--refresh] [--ignore-errors] [--]

          <filepattern>...
 
 DESCRIPTION
          <filepattern>...
 
 DESCRIPTION


@@ -86,6 +86,12 @@ OPTIONS
        command line. If no paths are specified, all tracked files in the
        current directory and its subdirectories are updated.
 
        command line. If no paths are specified, all tracked files in the
        current directory and its subdirectories are updated.
 

+-A::
+--all::
+       Update files that git already knows about (same as '\--update')
+       and add all untracked files that are not ignored by '.gitignore'
+       mechanism.
+

 --refresh::
        Don't add the file(s), but only refresh their stat()
        information in the index.
 --refresh::
        Don't add the file(s), but only refresh their stat()
        information in the index.


@@ -107,7 +113,7 @@ Configuration
 The optional configuration variable 'core.excludesfile' indicates a path to a
 file containing patterns of file names to exclude from git-add, similar to
 $GIT_DIR/info/exclude.  Patterns in the exclude file are used in addition to
 The optional configuration variable 'core.excludesfile' indicates a path to a
 file containing patterns of file names to exclude from git-add, similar to
 $GIT_DIR/info/exclude.  Patterns in the exclude file are used in addition to

-those in info/exclude.  See linkgit:gitrepository-layout[5][repository layout].
+those in info/exclude.  See linkgit:gitrepository-layout[5].

 
 
 EXAMPLES
 
 
 EXAMPLES


@@ -237,6 +243,7 @@ patch::
        k - leave this hunk undecided, see previous undecided hunk
        K - leave this hunk undecided, see previous hunk
        s - split the current hunk into smaller hunks
        k - leave this hunk undecided, see previous undecided hunk
        K - leave this hunk undecided, see previous hunk
        s - split the current hunk into smaller hunks

+       e - manually edit the current hunk

        ? - print help
 +
 After deciding the fate for all hunks, if there is any hunk
        ? - print help
 +
 After deciding the fate for all hunks, if there is any hunk