summaryrefslogtreecommitdiff
path: root/contrib/p4import
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2014-01-13 11:33:47 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2014-01-13 11:33:47 -0800
commita65a53bf04c56ae2365f57702a810af0551899a1 (patch)
treee4dde128458fdb70348adc8164a33a95514196f5 /contrib/p4import
parentMerge branch 'jk/pull-rebase-using-fork-point' (diff)
parentrm: better document side effects when removing a submodule (diff)
downloadtgif-a65a53bf04c56ae2365f57702a810af0551899a1.tar.xz
Merge branch 'jl/submodule-mv-checkout-caveat'
With a submodule that was initialized in an old fashioned way without gitlinks, switching branches in the superproject between the one with and without the submodule may leave the submodule working tree with its embedded repository behind, as there may be unexpendable state there. Document and warn users about this. * jl/submodule-mv-checkout-caveat: rm: better document side effects when removing a submodule mv: better document side effects when moving a submodule
Diffstat (limited to 'contrib/p4import')
0 files changed, 0 insertions, 0 deletions