We should really advise (new) developers to send rebased patches
that apply cleanly and use git-send-email rather than all other
obscure ways.