git reset mainline/master
git add -A
git commit
git format-patch mainline/master


Commit messages should be 80 chars on the first line

 Then continue down here
 for as many lines as you'd like
  * and in any format
  1) you see fit.