From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 8 May 2018 06:59:27 +0000 (+0900)
Subject: Merge branch 'tb/config-default'
X-Git-Tag: v2.18.0-rc0~87
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=00bb99c424e90b6533170a034b7cbc7ff2e85e50;p=thirdparty%2Fgit.git

Merge branch 'tb/config-default'

"git config --get" learned the "--default" option, to help the
calling script.  Building on top of the tb/config-type topic, the
"git config" learns "--type=color" type.  Taken together, you can
do things like "git config --get foo.color --default blue" and get
the ANSI color sequence for the color given to foo.color variable,
or "blue" if the variable does not exist.

* tb/config-default:
  builtin/config: introduce `color` type specifier
  config.c: introduce 'git_config_color' to parse ANSI colors
  builtin/config: introduce `--default`
---

00bb99c424e90b6533170a034b7cbc7ff2e85e50