| commit | 0fb5876ea0a5bdadd6e6295db8aad1b9ad173f87 | |
| author | Jeff King <peff@peff.net> | |
| Thu, 25 Oct 2012 11:15:16 +0000 (25 07:15 -0400) | ||
| committer | Jeff King <peff@peff.net> | |
| Thu, 25 Oct 2012 11:15:16 +0000 (25 07:15 -0400) | ||
| tree | 834ae033a8df4979709fd58a72f08d9ab7a21e8d | treesnapshot (tar.gz zip) |
| parent | 2cfceefaca16d64baecf0ba9bcd4e05229d9c31b | commitdiff |
| parent | 293ab15eea341ffe8705bac99136f2e3a286db5f | commitdiff |
Merge branch 'jl/submodule-rm' into next
"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.
Will merge to 'master' in the second batch after 1.8.0 ships.
* jl/submodule-rm:
submodule: teach rm to remove submodules unless they contain a git directory
"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.
Will merge to 'master' in the second batch after 1.8.0 ships.
* jl/submodule-rm:
submodule: teach rm to remove submodules unless they contain a git directory
| builtin/rm.c | diff1 | diff2 | blobhistory |
| submodule.c | diff1 | diff2 | blobhistory |
| submodule.h | diff1 | diff2 | blobhistory |