]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'pb/no-recursive-reset-hard-in-worktree-add'
authorJunio C Hamano <gitster@pobox.com>
Sun, 1 Dec 2019 17:04:31 +0000 (09:04 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sun, 1 Dec 2019 17:04:31 +0000 (09:04 -0800)
"git worktree add" internally calls "reset --hard" that should not
descend into submodules, even when submodule.recurse configuration
is set, but it was affected.  This has been corrected.

* pb/no-recursive-reset-hard-in-worktree-add:
  worktree: teach "add" to ignore submodule.recurse config

1  2 
builtin/worktree.c

Simple merge