summaryrefslogtreecommitdiff
path: root/Documentation/merge-options.txt
diff options
context:
space:
mode:
authorLibravatar Philippe Blain <levraiphilippeblain@gmail.com>2019-10-27 17:16:25 +0000
committerLibravatar Junio C Hamano <gitster@pobox.com>2019-10-30 09:57:15 +0900
commit4782cf2ab686bacca8d2908319981ac27d54ca25 (patch)
treef2ba37df193ff94f8fa3a44bf6f35eae508a07bd /Documentation/merge-options.txt
parentGit 2.23 (diff)
downloadtgif-4782cf2ab686bacca8d2908319981ac27d54ca25.tar.xz
worktree: teach "add" to ignore submodule.recurse config
"worktree add" internally calls "reset --hard", but if submodule.recurse is set, reset tries to recurse into initialized submodules, which makes start_command try to cd into non-existing submodule paths and die. Fix that by making sure that the call to reset in "worktree add" does not recurse. Signed-off-by: Philippe Blain <levraiphilippeblain@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/merge-options.txt')
0 files changed, 0 insertions, 0 deletions