clarify that some manual editing of patches may be required
    
    I've asked for a general way to handle this issue at
    http://article.gmane.org/gmane.comp.version-control.git/197885
    But in the meantime, document the manual workaround.