Merge branch 'js/add-edit'

* js/add-edit:
t3702: fix reliance on SHELL_PATH being '/bin/sh'
git-add: introduce --edit (to edit the diff vs. the index)

diff --combined Documentation/git-add.txt
index d938b422893067feb1a430edb34fb51ef7db6d85,25e666773630af3c86abd7513c1a396ebe362517..ab1943c71243df245f84ede7a69e4c666a8d8834
--- 1/Documentation/git-add.txt
--- 2/Documentation/git-add.txt
+++ b/Documentation/git-add.txt
@@@ -9,7 -9,7 +9,7 @@@ SYNOPSI
  --------
  [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
@@@ -76,6 -76,15 +76,15 @@@ OPTION
        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
@@@ -245,11 -254,8 +254,11 @@@ patch:
  
         y - stage this hunk
         n - do not stage this hunk
 +       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
 +       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