summaryrefslogtreecommitdiff
path: root/mergetools/opendiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2016-05-10 10:38:31 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-05-10 10:38:31 -0700
commit8ab8d959c6bf2f111590a230c841c352b8cf6518 (patch)
tree022d9d6eee6d6508bea4dc5b81be0de57b588f33 /mergetools/opendiff
parentt5551: make the test for extra HTTP headers more robust (diff)
parentsubmodule: stop sanitizing config options (diff)
downloadtgif-8ab8d959c6bf2f111590a230c841c352b8cf6518.tar.xz
Merge branch 'jk/submodule-c-credential' into js/http-custom-headers
* jk/submodule-c-credential: submodule: stop sanitizing config options submodule: use prepare_submodule_repo_env consistently submodule--helper: move config-sanitizing to submodule.c submodule: export sanitized GIT_CONFIG_PARAMETERS t5550: break submodule config test into multiple sub-tests t5550: fix typo in $HTTPD_URL git_config_push_parameter: handle empty GIT_CONFIG_PARAMETERS git: submodule honor -c credential.* from command line quote: implement sq_quotef() submodule: fix segmentation fault in submodule--helper clone submodule: fix submodule--helper clone usage submodule: check argc count for git submodule--helper clone submodule: don't pass empty string arguments to submodule--helper clone
Diffstat (limited to 'mergetools/opendiff')
0 files changed, 0 insertions, 0 deletions