diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-09-19 14:05:09 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-09-19 14:05:09 -0700 |
| commit | 723361a572e8c9fe93f00b17a1f4ed02585923b2 (patch) | |
| tree | 7479c011c8f1a008558b68c252733096b47aec11 /builtin/diff.c | |
| parent | 96db324a73fdada6fbe7b63221986f8f18cc63b0 (diff) | |
| parent | b9c7d6e4330e3dcdb3b3e5f013e5667e47555c95 (diff) | |
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"
Diffstat (limited to 'builtin/diff.c')
0 files changed, 0 insertions, 0 deletions