summaryrefslogtreecommitdiff
path: root/xdiff-interface.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2017-06-04 10:20:57 +0900
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-06-04 10:20:57 +0900
commitfb11de9ef58305a3dce6ebaaf53cc8c7ff9c5231 (patch)
tree6a940ab652f29142b7d11add8bd632d358af843b /xdiff-interface.c
parentMerge branch 'ab/fix-poison-tests' into maint (diff)
parentbuiltin/log: honor log.decorate (diff)
downloadtgif-fb11de9ef58305a3dce6ebaaf53cc8c7ff9c5231.tar.xz
Merge branch 'ah/log-decorate-default-to-auto' into maint
Setting "log.decorate=false" in the configuration file did not take effect in v2.13, which has been corrected. * ah/log-decorate-default-to-auto: builtin/log: honor log.decorate
Diffstat (limited to 'xdiff-interface.c')
0 files changed, 0 insertions, 0 deletions