summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2018-02-27 18:34:03 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-02-27 18:34:03 (GMT)
commit9dc254b7adb5c44b0158ab125bd4d4a66cc675fa (patch)
treed525cac8779a184d27e2ffded2efe5ac35376ff1 /contrib
parent34b65c65b55abd5e60d7cc6af2e26af3cc5173f9 (diff)
parent5aea9fe6cccf7a29551f86e1c2ec85ab0ba12e8e (diff)
downloadgit-9dc254b7adb5c44b0158ab125bd4d4a66cc675fa.zip
git-9dc254b7adb5c44b0158ab125bd4d4a66cc675fa.tar.gz
git-9dc254b7adb5c44b0158ab125bd4d4a66cc675fa.tar.bz2
Merge branch 'rd/typofix'
Typofix. * rd/typofix: Correct mispellings of ".gitmodule" to ".gitmodules" t/: correct obvious typo "detahced"
Diffstat (limited to 'contrib')
-rw-r--r--contrib/subtree/git-subtree.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/subtree/git-subtree.txt b/contrib/subtree/git-subtree.txt
index 60d76cd..352deda 100644
--- a/contrib/subtree/git-subtree.txt
+++ b/contrib/subtree/git-subtree.txt
@@ -28,7 +28,7 @@ as a subdirectory of your application.
Subtrees are not to be confused with submodules, which are meant for
the same task. Unlike submodules, subtrees do not need any special
-constructions (like .gitmodule files or gitlinks) be present in
+constructions (like .gitmodules files or gitlinks) be present in
your repository, and do not force end-users of your
repository to do anything special or to understand how subtrees
work. A subtree is just a subdirectory that can be