diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2018-07-18 12:20:28 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-07-18 12:20:28 -0700 |
| commit | 7e25437d35a70791b345872af202eabfb3e1a8bc (patch) | |
| tree | 1d8dcdc9814e310d8be656b11d76885c37191185 /t/t4300-merge-tree.sh | |
| parent | Merge branch 'sb/object-store-grafts' (diff) | |
| parent | submodule deinit: unset core.worktree (diff) | |
| download | tgif-7e25437d35a70791b345872af202eabfb3e1a8bc.tar.xz | |
Merge branch 'sb/submodule-core-worktree'
"git submodule" did not correctly adjust core.worktree setting that
indicates whether/where a submodule repository has its associated
working tree across various state transitions, which has been
corrected.
* sb/submodule-core-worktree:
submodule deinit: unset core.worktree
submodule: ensure core.worktree is set after update
submodule: unset core.worktree if no working tree is present
Diffstat (limited to 't/t4300-merge-tree.sh')
0 files changed, 0 insertions, 0 deletions