git-checkout.txt: fix incorrect statement about HEAD and index

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

diff --git a/Documentation/git-add.txt b/Documentation/git-add.txt
index 011a7436529f50e8b128f19d30bbeb0bdc82375b..2b6d6c86547b2cec370d34b14ddef25264404892 100644 (file)
--- a/Documentation/git-add.txt
+++ b/Documentation/git-add.txt
@@ -9,7 +9,7 @@ SYNOPSIS
 --------
 [verse]
 'git add' [-n] [-v] [--force | -f] [--interactive | -i] [--patch | -p]
 --------
 [verse]
 'git add' [-n] [-v] [--force | -f] [--interactive | -i] [--patch | -p]

-         [--update | -u] [--refresh] [--ignore-errors] [--]
+         [--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.


@@ -187,8 +193,9 @@ update::
    "Update>>".  When the prompt ends with double '>>', you can
    make more than one selection, concatenated with whitespace or
    comma.  Also you can say ranges.  E.g. "2-5 7,9" to choose
    "Update>>".  When the prompt ends with double '>>', you can
    make more than one selection, concatenated with whitespace or
    comma.  Also you can say ranges.  E.g. "2-5 7,9" to choose

-   2,3,4,5,7,9 from the list.  You can say '*' to choose
-   everything.
+   2,3,4,5,7,9 from the list.  If the second number in a range is
+   omitted, all remaining patches are taken.  E.g. "7-" to choose
+   7,8,9 from the list.  You can say '*' to choose everything.

 +
 What you chose are then highlighted with '*',
 like this:
 +
 What you chose are then highlighted with '*',
 like this:


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