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 d938b422893067feb1a430edb34fb51ef7db6d85..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