Merge branch 'ta/pretty-parse-config'

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