diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2018-03-22 14:24:22 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-03-22 14:24:22 -0700 |
| commit | 9ea8e0ca81e4aa9db312185f26b3cdcd4602e904 (patch) | |
| tree | 0f10528c2c4fce21d680844ce67362374628c9ba /contrib | |
| parent | Merge branch 'bp/fsmonitor' into maint (diff) | |
| parent | Correct mispellings of ".gitmodule" to ".gitmodules" (diff) | |
| download | tgif-9ea8e0ca81e4aa9db312185f26b3cdcd4602e904.tar.xz | |
Merge branch 'rd/typofix' into maint
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.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/subtree/git-subtree.txt b/contrib/subtree/git-subtree.txt index 60d76cdddf..352deda69d 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 |