summaryrefslogtreecommitdiff
path: root/blame.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2018-11-13 22:37:22 +0900
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-11-13 22:37:22 +0900
commitabb4824d13a44f68d1bbaf6726945983230771f9 (patch)
tree316449048983aa8a4503af46cd450199a69b1078 /blame.c
parentMerge branch 'nb/worktree-api-doc' (diff)
parentt/helper: add test-submodule-nested-repo-config (diff)
downloadtgif-abb4824d13a44f68d1bbaf6726945983230771f9.tar.xz
Merge branch 'ao/submodule-wo-gitmodules-checked-out'
The submodule support has been updated to read from the blob at HEAD:.gitmodules when the .gitmodules file is missing from the working tree. * ao/submodule-wo-gitmodules-checked-out: t/helper: add test-submodule-nested-repo-config submodule: support reading .gitmodules when it's not in the working tree submodule: add a helper to check if it is safe to write to .gitmodules t7506: clean up .gitmodules properly before setting up new scenario submodule: use the 'submodule--helper config' command submodule--helper: add a new 'config' subcommand t7411: be nicer to future tests and really clean things up t7411: merge tests 5 and 6 submodule: factor out a config_set_in_gitmodules_file_gently function submodule: add a print_config_from_gitmodules() helper
Diffstat (limited to 'blame.c')
0 files changed, 0 insertions, 0 deletions