Merge branch 'ta/pretty-parse-config'
commit51eeaea2108a4105542fe03935b411dfdbf5fe2b
authorJunio C Hamano <gitster@pobox.com>
Tue, 2 Sep 2014 20:27:39 +0000 (2 13:27 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 2 Sep 2014 20:27:40 +0000 (2 13:27 -0700)
tree1f4970c473bcbb957d9f445aab0bb55e94989a05
parent4740891e47de5ee33d91ffa3fdde25e8f0c4af74
parenta26bc613a64ac2c7ee69a50675e61b004a26382d
Merge branch 'ta/pretty-parse-config'

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