summaryrefslogtreecommitdiff
path: root/Documentation/git-merge-base.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2018-07-18 12:20:31 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-07-18 12:20:31 -0700
commitb9632c9d95f601c3d557cdbad60c06fcc7d30110 (patch)
treebe604c30d9bfc2ef04d9fd0484dd108326e90519 /Documentation/git-merge-base.txt
parentMerge branch 'jk/branch-l-0-deprecation' (diff)
parentsubmodule-config: reuse config_from_gitmodules in repo_read_gitmodules (diff)
downloadtgif-b9632c9d95f601c3d557cdbad60c06fcc7d30110.tar.xz
Merge branch 'ao/config-from-gitmodules'
Tighten the API to make it harder to misuse in-tree .gitmodules file, even though it shares the same syntax with configuration files, to read random configuration items from it. * ao/config-from-gitmodules: submodule-config: reuse config_from_gitmodules in repo_read_gitmodules submodule-config: pass repository as argument to config_from_gitmodules submodule-config: make 'config_from_gitmodules' private submodule-config: add helper to get 'update-clone' config from .gitmodules submodule-config: add helper function to get 'fetch' config from .gitmodules config: move config_from_gitmodules to submodule-config.c
Diffstat (limited to 'Documentation/git-merge-base.txt')
0 files changed, 0 insertions, 0 deletions