I generally use git add -e <file> instead of git add -p \<file\> You can modify the patch hunks with a text editor with git add -e . It is much more convenient in my opinion.