summaryrefslogtreecommitdiff
path: root/builtin/merge.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2017-03-17 13:50:23 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-03-17 13:50:23 -0700
commit94c9b5af703eb70adba349cfbfaaa3029849744c (patch)
treecfb8557c71f0f2f8b586c63b9d51ae3a4745b48b /builtin/merge.c
parentSync with 'maint' (diff)
parentDocumentation/git-update-index: explain splitIndex.* (diff)
downloadtgif-94c9b5af703eb70adba349cfbfaaa3029849744c.tar.xz
Merge branch 'cc/split-index-config'
The experimental "split index" feature has gained a few configuration variables to make it easier to use. * cc/split-index-config: (22 commits) Documentation/git-update-index: explain splitIndex.* Documentation/config: add splitIndex.sharedIndexExpire read-cache: use freshen_shared_index() in read_index_from() read-cache: refactor read_index_from() t1700: test shared index file expiration read-cache: unlink old sharedindex files config: add git_config_get_expiry() from gc.c read-cache: touch shared index files when used sha1_file: make check_and_freshen_file() non static Documentation/config: add splitIndex.maxPercentChange t1700: add tests for splitIndex.maxPercentChange read-cache: regenerate shared index if necessary config: add git_config_get_max_percent_split_change() Documentation/git-update-index: talk about core.splitIndex config var Documentation/config: add information for core.splitIndex t1700: add tests for core.splitIndex update-index: warn in case of split-index incoherency read-cache: add and then use tweak_split_index() split-index: add {add,remove}_split_index() functions config: add git_config_get_split_index() ...
Diffstat (limited to 'builtin/merge.c')
0 files changed, 0 insertions, 0 deletions