diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2017-12-06 09:23:35 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-12-06 09:23:35 -0800 |
| commit | 0b75572a1b9f601b751d431faea55f492ea92ac9 (patch) | |
| tree | 77c08b1f554cedb53a924e6ab0ef23e947469858 /Documentation/git-merge-file.txt | |
| parent | Sync with v2.15.1 (diff) | |
| parent | Documentation/checkout: clarify submodule HEADs to be detached (diff) | |
| download | tgif-0b75572a1b9f601b751d431faea55f492ea92ac9.tar.xz | |
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
Diffstat (limited to 'Documentation/git-merge-file.txt')
0 files changed, 0 insertions, 0 deletions