| commit | 0b75572a1b9f601b751d431faea55f492ea92ac9 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 6 Dec 2017 17:23:35 +0000 (6 09:23 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 6 Dec 2017 17:23:35 +0000 (6 09:23 -0800) | ||
| tree | 77c08b1f554cedb53a924e6ab0ef23e947469858 | treesnapshot (tar.gz zip) |
| parent | 1a4e40aa5dc16564af879142ba9dfbbb88d1e5ff | commitdiff |
| parent | 57f22bf9979c94f66c3596fb28d0588c1edc2f8d | commitdiff |
Merge branch 'sb/submodule-recursive-checkout-detach-head'
"git checkout --recursive" may overwrite and rewind the history of
the branch that happens to be checked out in submodule
repositories, which might not be desirable. Detach the HEAD but
still allow the recursive checkout to succeed in such a case.
* sb/submodule-recursive-checkout-detach-head:
Documentation/checkout: clarify submodule HEADs to be detached
recursive submodules: detach HEAD from new state
"git checkout --recursive" may overwrite and rewind the history of
the branch that happens to be checked out in submodule
repositories, which might not be desirable. Detach the HEAD but
still allow the recursive checkout to succeed in such a case.
* sb/submodule-recursive-checkout-detach-head:
Documentation/checkout: clarify submodule HEADs to be detached
recursive submodules: detach HEAD from new state
| Documentation/git-checkout.txt | diff1 | diff2 | blobhistory |
| submodule.c | diff1 | diff2 | blobhistory |
| t/lib-submodule-update.sh | diff1 | diff2 | blobhistory |