]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'ta/pretty-parse-config'
authorJunio C Hamano <gitster@pobox.com>
Tue, 2 Sep 2014 20:27:39 +0000 (13:27 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 2 Sep 2014 20:27:40 +0000 (13:27 -0700)
* ta/pretty-parse-config:
  pretty.c: make git_pretty_formats_config return -1 on git_config_string failure

1  2 
pretty.c

diff --cc pretty.c
Simple merge