Hunks In Their Trunks

Hunk #n failed at nnn. N out of n hunks failed - saving rejects to file file. rej this means that one or more changes, called hunks, could not be introduced into the file. The --reject option will instruct git to not fail if it cannot determine how to apply a patch, but instead to apply the individual hunks it can apply and create reject files (. rej) for hunks it cannot apply.

This provides an interactive way to add in content, letting you decide whether each hunk should go in or not,. That way you can even edit the hunks manually very easy, which is a bit of a pain when in git add -p: $ git stash -u $ git difftool -d -t meld stash $ git commit -a -m some message $ git stash.