Handle fixup commits

Created by: aschmolck

Marge should probably squash fixup commits automatically.