diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2009-05-18 09:00:06 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-05-18 09:00:06 -0700 |
| commit | 362724af6cf5edf35832ba0dbc7783806a38871e (patch) | |
| tree | c66f9012eb1ee65b48a663333017ddaaee964886 /Documentation | |
| parent | Merge branch 'mh/diff-stat-color' (diff) | |
| parent | t3702: fix reliance on SHELL_PATH being '/bin/sh' (diff) | |
| download | tgif-362724af6cf5edf35832ba0dbc7783806a38871e.tar.xz | |
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)
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-add.txt | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/Documentation/git-add.txt b/Documentation/git-add.txt index d938b42289..ab1943c712 100644 --- 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] - [--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 @@ OPTIONS 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 |