Merge branch 'ph/submodule-rebase' (early part)

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

diff --git a/Documentation/git-add.txt b/Documentation/git-add.txt
index 709e04b335005b8c4de03f1cc47a5cba1ceffcdf..ab1943c71243df245f84ede7a69e4c666a8d8834 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]

-         [--all | [--update | -u]] [--intent-to-add | -N]
+         [--edit | -e] [--all | [--update | -u]] [--intent-to-add | -N]

          [--refresh] [--ignore-errors] [--] <filepattern>...
 
 DESCRIPTION
          [--refresh] [--ignore-errors] [--] <filepattern>...
 
 DESCRIPTION


@@ -76,6 +76,15 @@ OPTIONS
        bypassed and the 'patch' subcommand is invoked using each of
        the specified filepatterns before exiting.
 
        bypassed and the 'patch' subcommand is invoked using each of
        the specified filepatterns before exiting.
 

+-e, \--edit::
+       Open the diff vs. the index in an editor and let the user
+       edit it.  After the editor was closed, adjust the hunk headers
+       and apply the patch to the index.
++
+*NOTE*: Obviously, if you change anything else than the first character
+on lines beginning with a space or a minus, the patch will no longer
+apply.
+

 -u::
 --update::
        Update only files that git already knows about, staging modified
 -u::
 --update::
        Update only files that git already knows about, staging modified


@@ -245,9 +254,11 @@ patch::
 
        y - stage this hunk
        n - do not stage this hunk
 
        y - stage this hunk
        n - do not stage this hunk

-       q - quite, do not stage this hunk nor any of the remaining ones
+       q - quit, do not stage this hunk nor any of the remaining ones

        a - stage this and all the remaining hunks in the file
        d - do not stage this hunk nor any of the remaining hunks in the file
        a - stage this and all the remaining hunks in the file
        d - do not stage this hunk nor any of the remaining hunks in the file

+       g - select a hunk to go to
+       / - search for a hunk matching the given regex

        j - leave this hunk undecided, see next undecided hunk
        J - leave this hunk undecided, see next hunk
        k - leave this hunk undecided, see previous undecided hunk
        j - leave this hunk undecided, see next undecided hunk
        J - leave this hunk undecided, see next hunk
        k - leave this hunk undecided, see previous undecided hunk