From: Junio C Hamano Date: Fri, 19 Sep 2014 21:05:09 +0000 (-0700) Subject: Merge branch 'jk/pretty-empty-format' into maint X-Git-Tag: v2.1.1~12 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=723361a572e8c9fe93f00b17a1f4ed02585923b2;p=thirdparty%2Fgit.git 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" --- 723361a572e8c9fe93f00b17a1f4ed02585923b2