| commit | a65a53bf04c56ae2365f57702a810af0551899a1 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 13 Jan 2014 19:33:47 +0000 (13 11:33 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 13 Jan 2014 19:33:47 +0000 (13 11:33 -0800) | ||
| tree | e4dde128458fdb70348adc8164a33a95514196f5 | treesnapshot (tar.gz zip) |
| parent | 5e72e7168c8eefa7bcb02b0499785db0578b549b | commitdiff |
| parent | bbad9f9314f658b5c0f302148fc9780f5788dcd8 | commitdiff |
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
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