From: Junio C Hamano Date: Mon, 18 May 2009 16:00:06 +0000 (-0700) Subject: Merge branch 'js/add-edit' X-Git-Tag: v1.6.4-rc0~158 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/362724af6cf5edf35832ba0dbc7783806a38871e?hp=-c 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) --- 362724af6cf5edf35832ba0dbc7783806a38871e diff --combined Documentation/git-add.txt index d938b42289,25e6667736..ab1943c712 --- a/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] [--] ... 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