diff options
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2009-04-08 21:30:24 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-04-12 18:56:17 (GMT) |
| commit | c59cb03a8bfc4b09758b07b23b6fe70a909ff9f4 (patch) | |
| tree | ffdafbf48cc9b22bd0235b5f56cf78098d5d23bb /Documentation/git-add.txt | |
| parent | ee7ec2f9ded03700f2b95cc1d4b3d60ed374132a (diff) | |
| download | git-c59cb03a8bfc4b09758b07b23b6fe70a909ff9f4.zip git-c59cb03a8bfc4b09758b07b23b6fe70a909ff9f4.tar.gz git-c59cb03a8bfc4b09758b07b23b6fe70a909ff9f4.tar.bz2 | |
git-add: introduce --edit (to edit the diff vs. the index)
With "git add -e [<files>]", Git will fire up an editor with the current
diff relative to the index (i.e. what you would get with "git diff
[<files>]").
Now you can edit the patch as much as you like, including adding/removing
lines, editing the text, whatever. Make sure, though, that the first
character of the hunk lines is still a space, a plus or a minus.
After you closed the editor, Git will adjust the line counts of the hunks
if necessary, thanks to the --recount option of apply, and commit the
patch. Except if you deleted everything, in which case nothing happens
(for obvious reasons).
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-add.txt')
| -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 ce71838..25e6667 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 |