Merge branch 'jk/pretty-empty-format' into maint

* jk/pretty-empty-format:
pretty: make empty userformats truly empty
pretty: treat "--format=" as an empty userformat
revision: drop useless string offset when parsing "--pretty"

diff --cc combine-diff.c
Simple merge