author | Johannes Schindelin <johannes.schindelin@gmx.de> | |
Wed, 8 Apr 2009 21:30:24 +0000 (23:30 +0200) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Sun, 12 Apr 2009 18:56:17 +0000 (11:56 -0700) | ||
commit | c59cb03a8bfc4b09758b07b23b6fe70a909ff9f4 | |
tree | ffdafbf48cc9b22bd0235b5f56cf78098d5d23bb | tree | snapshot |
parent | ee7ec2f9ded03700f2b95cc1d4b3d60ed374132a | commit | diff |
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>
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>
Documentation/git-add.txt | diff | blob | history | |
builtin-add.c | diff | blob | history | |
t/t3702-add-edit.sh | [new file with mode: 0755] | blob |