From: Avery Pennarun Date: Thu, 21 Oct 2010 19:28:18 +0000 (-0700) Subject: Fix a few typos/grammar-o's in the preceding commit. X-Git-Tag: v1.7.11-rc0~176^2~7 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=9a40fcc2014cc4a85eca71f81ff4c86d49b7a9e2;p=git.git Fix a few typos/grammar-o's in the preceding commit. --- diff --git a/git-subtree.txt b/git-subtree.txt index 18a9af501..0c44fda01 100644 --- a/git-subtree.txt +++ b/git-subtree.txt @@ -9,11 +9,11 @@ git-subtree - Merge subtrees together and split repository into subtrees SYNOPSIS -------- [verse] -'git subtree' add -P |--prefix= -'git subtree' pull -P |--prefix= -'git subtree' push -P |--prefix= -'git subtree' merge -P |--prefix= -'git subtree' split -P |--prefix= [OPTIONS] [] +'git subtree' add -P +'git subtree' pull -P +'git subtree' push -P +'git subtree' merge -P +'git subtree' split -P [OPTIONS] [] DESCRIPTION @@ -34,9 +34,9 @@ work. A subtree is just a subdirectory that can be committed to, branched, and merged along with your project in any way you want. -They are neither not to be confused with using the subtree merge +They are also not to be confused with using the subtree merge strategy. The main difference is that, besides merging -of the other project as a subdirectory, you can also extract the +the other project as a subdirectory, you can also extract the entire history of a subdirectory from your project and make it into a standalone project. Unlike the subtree merge strategy you can alternate back and forth between these