summaryrefslogtreecommitdiffstats
path: root/git-rm.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-09-10 17:39:23 +0900
committerJunio C Hamano <gitster@pobox.com>2017-09-10 17:39:23 +0900
commit88bf5716b2ea27d90ae93a2f12525a0e143e3b39 (patch)
tree0ddd74fc574f9dc6ccd7667437b0f60b5fb6a94a /git-rm.txt
parentbc39b7db11be3ba4e93e34f706b8a774e523bf1b (diff)
downloadgit-htmldocs-88bf5716b2ea27d90ae93a2f12525a0e143e3b39.tar.gz
Autogenerated HTML docs for v2.14.1-536-g68672
Diffstat (limited to 'git-rm.txt')
-rw-r--r--git-rm.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-rm.txt b/git-rm.txt
index 683e59133..b5c46223c 100644
--- a/git-rm.txt
+++ b/git-rm.txt
@@ -146,7 +146,7 @@ the submodule's history. If it exists the submodule.<name> section
in the linkgit:gitmodules[5] file will also be removed and that file
will be staged (unless --cached or -n are used).
-A submodule is considered up-to-date when the HEAD is the same as
+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