Merge branch 'ar/submodule-add-config' into ar/submodule-add

author Junio C Hamano <gitster@pobox.com>

Tue, 10 Aug 2021 18:01:19 +0000 (11:01 -0700)

committer Junio C Hamano <gitster@pobox.com>

Tue, 10 Aug 2021 18:01:19 +0000 (11:01 -0700)
author Junio C Hamano <gitster@pobox.com>
Tue, 10 Aug 2021 18:01:19 +0000 (11:01 -0700)
committer Junio C Hamano <gitster@pobox.com>
Tue, 10 Aug 2021 18:01:19 +0000 (11:01 -0700)
diff --cc builtin/submodule--helper.c
Simple merge
diff --cc git-submodule.sh
Simple merge
diff --cc submodule.c
Simple merge
author	Junio C Hamano <gitster@pobox.com>
	Tue, 10 Aug 2021 18:01:19 +0000 (11:01 -0700)
committer	Junio C Hamano <gitster@pobox.com>
	Tue, 10 Aug 2021 18:01:19 +0000 (11:01 -0700)
		1	2
builtin/submodule--helper.c	patch \|	diff1 \|	diff2 \|	blob \| history
git-submodule.sh	patch \|	diff1 \|	diff2 \|	blob \| history
submodule.c	patch \|	diff1 \|	diff2 \|	blob \| history