summaryrefslogtreecommitdiff
path: root/Documentation/git-merge-base.txt
diff options
context:
space:
mode:
authorLibravatar Jens Lehmann <Jens.Lehmann@web.de>2014-01-07 22:32:37 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2014-01-07 14:34:06 -0800
commitbbad9f9314f658b5c0f302148fc9780f5788dcd8 (patch)
tree9c1c6f25614f987ddeb45bba0e748035e888fbd7 /Documentation/git-merge-base.txt
parentmv: better document side effects when moving a submodule (diff)
downloadtgif-bbad9f9314f658b5c0f302148fc9780f5788dcd8.tar.xz
rm: better document side effects when removing a submodule
The "Submodules" section of the "git rm" documentation mentions what will happen when a submodule with a gitfile gets removed with newer git. But it doesn't talk about what happens when the user changes between commits before and after the removal, which does not remove the submodule from the work tree like using the rm command did the first time. Explain what happens and what the user has to do manually to fix that in the new BUGS section. Also document this behavior in a new test. Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-merge-base.txt')
0 files changed, 0 insertions, 0 deletions