summaryrefslogtreecommitdiff
path: root/xdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-06-27 16:56:23 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-06-27 16:56:23 (GMT)
commitfbb4138cb2e6b77d1d8386f336e7813fcfd3cb02 (patch)
tree0cb026bfefb9cb551f1e61d6ca857640d530e870 /xdiff
parent0a20325a01d089d8274aa4be05d79e6c157e1319 (diff)
parentb15a3e005af07843116c73205742adfbab3d2e82 (diff)
downloadgit-fbb4138cb2e6b77d1d8386f336e7813fcfd3cb02.zip
git-fbb4138cb2e6b77d1d8386f336e7813fcfd3cb02.tar.gz
git-fbb4138cb2e6b77d1d8386f336e7813fcfd3cb02.tar.bz2
Merge branch 'et/pretty-format-c-auto' into maint
The commands in `git log` family take %C(auto) in a custom format string. This unconditionally turned the color on, ignoring --no-color or with --color=auto when the output is not connected to a tty; this was corrected to make the format truly behave as "auto". * et/pretty-format-c-auto: format_commit_message: honor `color=auto` for `%C(auto)`
Diffstat (limited to 'xdiff')
0 files changed, 0 insertions, 0 deletions