I'm trying to use git add --interactive to selectively add some changes to my index, but I continually receive the "Your edited hunk does not apply. Edit again..." message. I get this message even if I choose the [e]dit option, and immediately save/close my editor. In other words, without editing the hunk at all, the patch doesn't apply.
Here's the exact example I'm using (I'm trying to put together a small demo):
Original file:
first change
second change
third change
fourth change
New file:
Change supporting feature 1
first change
second change
third change
fourth change
bug fix 1
change supporting feature 1
I'm trying to show how to use git add --interactive to only add the "bug fix 1" line to the index. Running interactive add on the file, I choose the patch mode. It presents me with
diff --git a/newfile b/newfile
index 6d501a3..8b81ae9 100644
--- a/newfile
+++ b/newfile
@@ -1,6 +1,9 @@
+Change supporting feature 1
first change
second change off branch
third change off branch
second change
third change
fourth change
+bug fix 1
+change supporting feature 1
I respond with split, followed by "no" to apply the first hunk. The second hunk, I try to edit. I originally tried deleting the bottom line - that didn't work. Leaving the hunk alone completely doesn't work either, and I can't figure out why.
Thanks for the help.
Josh