mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jl/submodule-rm'

Browse Source 
* jl/submodule-rm:
  docs: move submodule section
This commit is contained in:
Junio C Hamano
2012-11-20 10:40:31 -08:00
parent 3a2c082383 3469c7ebbf
commit b4f35513be
1 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
Documentation/git-rm.txt
View File

@ -107,21 +107,6 @@ as well as modifications of existing paths.
Typically you would first remove all tracked files from the working Typically you would first remove all tracked files from the working
tree using this command: tree using this command:
Submodules
~~~~~~~~~~
Only submodules using a gitfile (which means they were cloned
with a git version 1.7.8 or newer) will be removed from the work
tree, as their repository lives inside the .git directory of the
superproject. If a submodule (or one of those nested inside it)
still uses a .git directory, `git rm` will fail - no matter if forced
or not - to protect the submodule's history.
A submodule is considered up-to-date when the HEAD is the same as
recorded in the index, no tracked files are modified and no untracked
files that aren't ignored are present in the submodules work tree.
Ignored files are deemed expendable and won't stop a submodule's work
tree from being removed.
---------------- ----------------
git ls-files -z | xargs -0 rm -f git ls-files -z | xargs -0 rm -f
---------------- ----------------
@ -149,6 +134,21 @@ use the following command:
git diff --name-only --diff-filter=D -z | xargs -0 git rm --cached git diff --name-only --diff-filter=D -z | xargs -0 git rm --cached
---------------- ----------------
Submodules
~~~~~~~~~~
Only submodules using a gitfile (which means they were cloned
with a git version 1.7.8 or newer) will be removed from the work
tree, as their repository lives inside the .git directory of the
superproject. If a submodule (or one of those nested inside it)
still uses a .git directory, `git rm` will fail - no matter if forced
or not - to protect the submodule's history.
A submodule is considered up-to-date when the HEAD is the same as
recorded in the index, no tracked files are modified and no untracked
files that aren't ignored are present in the submodules work tree.
Ignored files are deemed expendable and won't stop a submodule's work
tree from being removed.
EXAMPLES EXAMPLES
-------- --------
`git rm Documentation/\*.txt`:: `git rm Documentation/\*.txt`::