]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'gc/pull-recurse-submodules'
authorJunio C Hamano <gitster@pobox.com>
Fri, 20 May 2022 22:26:57 +0000 (15:26 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 20 May 2022 22:26:57 +0000 (15:26 -0700)
"git pull" without "--recurse-submodules=<arg>" made
submodule.recurse take precedence over fetch.recurseSubmodules by
mistake, which has been corrected.

* gc/pull-recurse-submodules:
  pull: do not let submodule.recurse override fetch.recurseSubmodules

1  2 
builtin/pull.c
t/t5572-pull-submodule.sh

diff --cc builtin/pull.c
Simple merge
Simple merge