Merge branch 'ta/pretty-parse-config' into next
commit07396f4dab39db2bab6d8b2a230cb46d7e02b12f
authorJunio C Hamano <gitster@pobox.com>
Wed, 13 Aug 2014 21:24:46 +0000 (13 14:24 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 13 Aug 2014 21:24:46 +0000 (13 14:24 -0700)
tree30e0eba045af3128fc920565a5b6667879051f40
parent9972bb249c5e6b546fcf0bd8ae685c184ce1b369
parenta26bc613a64ac2c7ee69a50675e61b004a26382d
Merge branch 'ta/pretty-parse-config' into next

* ta/pretty-parse-config:
  pretty.c: make git_pretty_formats_config return -1 on git_config_string failure
pretty.c