]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: ecbddd1 4782cf2)
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)
commit05fc6471e3668f17b665ec686d5629e92df917fa
treec7d5e2c7f5fe6f6ee2d63b149dde24a9fbc38642tree | snapshot
parentecbddd16bb2c725ad2305fd911bf237d845c862bcommit | diff
parent4782cf2ab686bacca8d2908319981ac27d54ca25commit | diff
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
builtin/worktree.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.