diff options
author | Junio C Hamano <gitster@pobox.com> | 2020-02-17 13:22:17 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2020-02-17 13:22:17 -0800 |
commit | 5d55554b1d099f3ae5e74f6d058edb55161510de (patch) | |
tree | f3c4a640addac61a756693580814627f76ea62e6 /builtin/difftool.c | |
parent | Merge branch 'rs/strbuf-insertstr' (diff) | |
parent | config: add '--show-scope' to print the scope of a config value (diff) | |
download | tgif-5d55554b1d099f3ae5e74f6d058edb55161510de.tar.xz |
Merge branch 'mr/show-config-scope'
"git config" learned to show in which "scope", in addition to in
which file, each config setting comes from.
* mr/show-config-scope:
config: add '--show-scope' to print the scope of a config value
submodule-config: add subomdule config scope
config: teach git_config_source to remember its scope
config: preserve scope in do_git_config_sequence
config: clarify meaning of command line scoping
config: split repo scope to local and worktree
config: make scope_name non-static and rename it
t1300: create custom config file without special characters
t1300: fix over-indented HERE-DOCs
config: fix typo in variable name
Diffstat (limited to 'builtin/difftool.c')
0 files changed, 0 insertions, 0 deletions