Merge branch 'so/format-patch-doc-on-default-diff-format'