summaryrefslogtreecommitdiffstats
path: root/git-rm.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-11-20 13:06:26 -0800
committerJunio C Hamano <gitster@pobox.com>2012-11-20 13:06:26 -0800
commitf2b7494f8bfdb746bbedce9cf8095db7164f92b0 (patch)
tree964d9a241ef90a5ebb834850515281998ba1137a /git-rm.txt
parent6f54c3afa9619c6b65d3f052d903393bc4e98d79 (diff)
downloadgit-htmldocs-f2b7494f8bfdb746bbedce9cf8095db7164f92b0.tar.gz
Autogenerated HTML docs for v1.8.0-251-g3a189
Diffstat (limited to 'git-rm.txt')
-rw-r--r--git-rm.txt30
1 files changed, 15 insertions, 15 deletions
diff --git a/git-rm.txt b/git-rm.txt
index 882cb1171..262436b7b 100644
--- a/git-rm.txt
+++ b/git-rm.txt
@@ -107,21 +107,6 @@ as well as modifications of existing paths.
Typically you would first remove all tracked files from the working
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
----------------
@@ -149,6 +134,21 @@ use the following command:
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
--------
`git rm Documentation/\*.txt`::