summaryrefslogtreecommitdiff
path: root/git-gui/lib/diff.tcl
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2021-12-10 14:35:15 -0800
committerJunio C Hamano <gitster@pobox.com>2021-12-10 14:35:15 -0800
commit670703e9d667f28221bfaa8baf75e90f0ba5ddca (patch)
tree3c63ae42ab8abe1b2207a8462e1b91e005c706e4 /git-gui/lib/diff.tcl
parentd67fc4bf0ba89835c61efd1279c732fc640b3b2d (diff)
parent0adc8ba6ae2b76501f4e0e57cc83d79be5305418 (diff)
Merge branch 'mp/absorb-submodule-git-dir-upon-deinit'
"git submodule deinit" for a submodule whose .git metadata directory is embedded in its working tree refused to work, until the submodule gets converted to use the "absorbed" form where the metadata directory is stored in superproject, and a gitfile at the top-level of the working tree of the submodule points at it. The command is taught to convert such submodules to the absorbed form as needed. * mp/absorb-submodule-git-dir-upon-deinit: submodule: absorb git dir instead of dying on deinit
Diffstat (limited to 'git-gui/lib/diff.tcl')
0 files changed, 0 insertions, 0 deletions