summaryrefslogtreecommitdiff
path: root/combine-diff.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2014-09-02 13:27:39 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2014-09-02 13:27:40 -0700
commit51eeaea2108a4105542fe03935b411dfdbf5fe2b (patch)
tree1f4970c473bcbb957d9f445aab0bb55e94989a05 /combine-diff.c
parentMerge branch 'bc/archive-pax-header-mode' (diff)
parentpretty.c: make git_pretty_formats_config return -1 on git_config_string failure (diff)
downloadtgif-51eeaea2108a4105542fe03935b411dfdbf5fe2b.tar.xz
Merge branch 'ta/pretty-parse-config'
* ta/pretty-parse-config: pretty.c: make git_pretty_formats_config return -1 on git_config_string failure
Diffstat (limited to 'combine-diff.c')
0 files changed, 0 insertions, 0 deletions