Logo Questions Linux Laravel Mysql Ubuntu Git Menu
 

git hunk edit mode - how to remove a '-' line?

Tags:

git

patch

+ bbb
- aaa

# ---
# To remove '-' lines, make them ' ' lines (context).
# To remove '+' lines, delete them.
# Lines starting with # will be removed.
#
# If the patch applies cleanly, the edited hunk will immediately be
# marked for staging. If it does not apply cleanly, you will be given
# an opportunity to edit again. If all lines of the hunk are removed,
# then the edit is aborted and the hunk is left unchanged.

I simply don't understand what make them ' ' lines means. How to apply + bbb only but not - aaa?

like image 234
Lai Yu-Hsuan Avatar asked May 24 '12 04:05

Lai Yu-Hsuan


2 Answers

make them ' ' lines means you need to replace the - in front of the line with a (space).

like image 197
dmedvinsky Avatar answered Oct 20 '22 05:10

dmedvinsky


A hunk like this:

+ bbb <-- line added
- aaa <-- line deleted
  ccc <-- line unchanged

will turn into content like this:

bbb
ccc

To keep a line marked for deletion (prefixed with '-'), turn it into a line with the same prefix as the unchanged line above (so it will stay the same):

+ bbb
  aaa
  ccc

When the hunk is applied, the contents will look like this:

bbb
aaa
ccc
like image 26
ellotheth Avatar answered Oct 20 '22 04:10

ellotheth