diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2019-12-01 09:04:31 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-12-01 09:04:31 -0800 |
| commit | 05fc6471e3668f17b665ec686d5629e92df917fa (patch) | |
| tree | c7d5e2c7f5fe6f6ee2d63b149dde24a9fbc38642 /Documentation/git-merge-file.txt | |
| parent | Merge branch 'pb/help-list-gitsubmodules-among-guides' (diff) | |
| parent | worktree: teach "add" to ignore submodule.recurse config (diff) | |
| download | tgif-05fc6471e3668f17b665ec686d5629e92df917fa.tar.xz | |
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
Diffstat (limited to 'Documentation/git-merge-file.txt')
0 files changed, 0 insertions, 0 deletions