From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 2 Sep 2014 20:27:39 +0000 (-0700)
Subject: Merge branch 'ta/pretty-parse-config'
X-Git-Tag: v2.2.0-rc0~174
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=51eeaea2108a4105542fe03935b411dfdbf5fe2b;p=thirdparty%2Fgit.git

Merge branch 'ta/pretty-parse-config'

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

51eeaea2108a4105542fe03935b411dfdbf5fe2b