Merge branch 'ta/pretty-parse-config' into jch
commit7c1d8404060b0feff420b292afe96b1cf22e2184
authorJunio C Hamano <gitster@pobox.com>
Thu, 21 Aug 2014 18:12:06 +0000 (21 11:12 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 21 Aug 2014 18:12:06 +0000 (21 11:12 -0700)
treeac37bcbd6864639b94910c5b26feaf840bdc981f
parentfe668f7a83c7081643feb10f7cf42c9f58cd5fca
parenta26bc613a64ac2c7ee69a50675e61b004a26382d
Merge branch 'ta/pretty-parse-config' into jch

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