diff options
| author |  Jeff King <peff@peff.net> | 2012-10-29 04:12:07 -0400 |
|---|---|---|
| committer | Jeff King <peff@peff.net> | 2012-10-29 04:12:07 -0400 |
| commit | d21240fafafdea4fb4cab27c0e9b58ebad7d6172 (patch) | |
| tree | 834ae033a8df4979709fd58a72f08d9ab7a21e8d /t/t3507-cherry-pick-conflict.sh | |
| parent | Merge branch 'jk/strbuf-detach-always-non-null' (diff) | |
| parent | submodule: teach rm to remove submodules unless they contain a git directory (diff) | |
| download | tgif-d21240fafafdea4fb4cab27c0e9b58ebad7d6172.tar.xz | |
Merge branch 'jl/submodule-rm'
"git rm submodule" cannot blindly remove a submodule directory as
its working tree may have local changes, and worse yet, it may even
have its repository embedded in it. Teach it some special cases
where it is safe to remove a submodule, specifically, when there is
no local changes in the submodule working tree, and its repository
is not embedded in its working tree but is elsewhere and uses the
gitfile mechanism to point at it.
* jl/submodule-rm:
submodule: teach rm to remove submodules unless they contain a git directory
Diffstat (limited to 't/t3507-cherry-pick-conflict.sh')
0 files changed, 0 insertions, 0 deletions