summaryrefslogtreecommitdiff
path: root/mergetools/ecmerge
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2017-03-17 13:50:28 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-03-17 13:50:28 -0700
commita0393a298fecff8cdc17aba51245f29433520d81 (patch)
treea6491d24988a63b067193fc852902ae41933b00d /mergetools/ecmerge
parentMerge branch 'bc/sha1-header-selection-with-cpp-macros' (diff)
parentsetup.c: mention unresolved problems (diff)
downloadtgif-a0393a298fecff8cdc17aba51245f29433520d81.tar.xz
Merge branch 'js/early-config'
The start-up sequence of "git" needs to figure out some configured settings before it finds and set itself up in the location of the repository and was quite messy due to its "chicken-and-egg" nature. The code has been restructured. * js/early-config: setup.c: mention unresolved problems t1309: document cases where we would want early config not to die() setup_git_directory_gently_1(): avoid die()ing t1309: test read_early_config() read_early_config(): really discover .git/ read_early_config(): avoid .git/config hack when unneeded setup: make read_early_config() reusable setup: introduce the discover_git_directory() function setup_git_directory_1(): avoid changing global state setup: prepare setup_discovered_git_dir() for the root directory setup_git_directory(): use is_dir_sep() helper t7006: replace dubious test
Diffstat (limited to 'mergetools/ecmerge')
0 files changed, 0 insertions, 0 deletions