summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2017-04-26 15:39:05 +0900
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-04-26 15:39:05 +0900
commitc9672ba4c86a5fb18ea20d1c4a2c0eb6a731f3cb (patch)
tree47c0d32f51053046b1a47b3113d8803f2a7c1279 /Documentation
parentMerge branch 'ab/push-cas-doc-n-test' (diff)
parentconfig: correct file reading order in read_early_config() (diff)
downloadtgif-c9672ba4c86a5fb18ea20d1c4a2c0eb6a731f3cb.tar.xz
Merge branch 'nd/conditional-config-in-early-config'
The recently introduced conditional inclusion of configuration did not work well when early-config mechanism was involved. * nd/conditional-config-in-early-config: config: correct file reading order in read_early_config() config: handle conditional include when $GIT_DIR is not set up config: prepare to pass more info in git_config_with_options()
Diffstat (limited to 'Documentation')
0 files changed, 0 insertions, 0 deletions