Merge branch 'jc/maint-format-patch-o-relative' into maint

* jc/maint-format-patch-o-relative: Teach format-patch to handle output directory relative to cwd Conflicts: t/t4014-format-patch.sh