summaryrefslogtreecommitdiff
path: root/git-merge-one-file.sh
diff options
context:
space:
mode:
authorLibravatar Johannes Schindelin <johannes.schindelin@gmx.de>2009-04-08 23:30:24 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-04-12 11:56:17 -0700
commitc59cb03a8bfc4b09758b07b23b6fe70a909ff9f4 (patch)
treeffdafbf48cc9b22bd0235b5f56cf78098d5d23bb /git-merge-one-file.sh
parentdocumentation: Makefile accounts for SHELL_PATH setting (diff)
downloadtgif-c59cb03a8bfc4b09758b07b23b6fe70a909ff9f4.tar.xz
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 'git-merge-one-file.sh')
0 files changed, 0 insertions, 0 deletions