summaryrefslogtreecommitdiff
path: root/t/t7605-merge-resolve.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2012-12-17 17:56:49 -0500
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-12-17 17:30:04 -0800
commit30825178fb72e3664bd1bda7c02c62e300e2e5ce (patch)
tree299ae9907e26fca9f2090b17ca387ff8b4aba9fa /t/t7605-merge-resolve.sh
parentt6006: clean up whitespace (diff)
downloadtgif-30825178fb72e3664bd1bda7c02c62e300e2e5ce.tar.xz
log --format: teach %C(auto,black) to respect color config
Traditionally, %C(color attr) always emitted the ANSI color sequence; it was up to the scripts that wanted to conditionally color their output to omit %C(...) specifier when they do not want colors. Optionally allow "auto," to be prefixed to the color, so that the output is colored iff we would color regular "log" output (e.g., taking into account color.* and --color command line options). Tests and pretty_context bits by Jeff King <peff@peff.net>. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t7605-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions