git-mergeup ignores submodules
strip whitespace from git-strip-new-whitespace