From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 1 Dec 2019 17:04:31 +0000 (-0800)
Subject: Merge branch 'pb/no-recursive-reset-hard-in-worktree-add'
X-Git-Tag: v2.25.0-rc0~126
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=05fc6471e3668f17b665ec686d5629e92df917fa;p=thirdparty%2Fgit.git

Merge branch 'pb/no-recursive-reset-hard-in-worktree-add'

"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
---

05fc6471e3668f17b665ec686d5629e92df917fa