Create patch files

git format-patch [-<num of commit>] [commit]

Apply patch file

git am <patch>

Fix patch errors

git apply <patch> --reject

Look at the created <.ref> file and fix the errors.

git add <modified files>

git am --continue