summaryrefslogtreecommitdiff
path: root/contrib/subtree
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-08-01 18:58:32 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-08-01 19:01:01 (GMT)
commitd50cb7569cfb6e04ba48900821618d28012f334e (patch)
tree641264cefb155981b8861759cd39665ffcd04cd2 /contrib/subtree
parent898bbe9664bf99bea6dcd4d03b2480f0f79b404b (diff)
parent98e023dea40a0eca8a61c037dfc59aaf27f003a4 (diff)
downloadgit-d50cb7569cfb6e04ba48900821618d28012f334e.zip
git-d50cb7569cfb6e04ba48900821618d28012f334e.tar.gz
git-d50cb7569cfb6e04ba48900821618d28012f334e.tar.bz2
Merge branch 'ob/typofixes'
* ob/typofixes: many small typofixes
Diffstat (limited to 'contrib/subtree')
-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 7ba853e..e0957ee 100644
--- a/contrib/subtree/git-subtree.txt
+++ b/contrib/subtree/git-subtree.txt
@@ -270,7 +270,7 @@ git-extensions repository in ~/git-extensions/:
name
You can omit the --squash flag, but doing so will increase the number
-of commits that are incldued in your local repository.
+of commits that are included in your local repository.
We now have a ~/git-extensions/git-subtree directory containing code
from the master branch of git://github.com/apenwarr/git-subtree.git