On Monday 15 October 2012, Stuart Henderson wrote: > Best to send the diff, with the accompanying text, in the same > email, and make sure they still all apply, I tried testing some of > these but didn't manage to get them to apply (either some > conflicting change, or they were in the wrong order and stacked up > on top of each other or something).
As you mentioned using git in another mail, I would recommend to use git's format-patch to create the mails. Maybe with the --no-prefix option, because that seems to be the preferred patch format here. Also, interactive rebase (git rebase -i) is nice for adjusting patches and commit messages (in case you didn't know that one). Cheers, Stefan