From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 17 Feb 2020 21:22:17 +0000 (-0800)
Subject: Merge branch 'mr/show-config-scope'
X-Git-Tag: v2.26.0-rc0~41
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5d55554b1d099f3ae5e74f6d058edb55161510de;p=thirdparty%2Fgit.git

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
---

5d55554b1d099f3ae5e74f6d058edb55161510de