aboutsummaryrefslogtreecommitdiffstats
path: root/diff.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2022-10-25 17:11:44 -0700
committerJunio C Hamano <gitster@pobox.com>2022-10-25 17:11:44 -0700
commit777f548b5a9e409b4c936a32a2cb61fd7a1bb45c (patch)
tree52dc51c3b3eb922d52ad5f1c08cde3f62ff27745 /diff.c
parentMerge branch 'rs/diff-caret-bang-with-parents' (diff)
parentconfig: respect includes in protected config (diff)
downloadgit-777f548b5a9e409b4c936a32a2cb61fd7a1bb45c.tar.gz
git-777f548b5a9e409b4c936a32a2cb61fd7a1bb45c.zip
Merge branch 'gc/bare-repo-discovery'
Allow configuration files in "protected" scopes to include other configuration files. * gc/bare-repo-discovery: config: respect includes in protected config
Diffstat (limited to 'diff.c')
0 files changed, 0 insertions, 0 deletions