diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2018-05-08 15:59:27 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-05-08 15:59:27 +0900 |
| commit | 00bb99c424e90b6533170a034b7cbc7ff2e85e50 (patch) | |
| tree | 0a37a6794ca54fb31e3b35b0c2f31be2c542e825 /mergetools | |
| parent | Merge branch 'tb/config-type' (diff) | |
| parent | builtin/config: introduce `color` type specifier (diff) | |
| download | tgif-00bb99c424e90b6533170a034b7cbc7ff2e85e50.tar.xz | |
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`
Diffstat (limited to 'mergetools')
0 files changed, 0 insertions, 0 deletions