Fix a few typos/grammar-o's in the preceding commit.
Avery Pennarun committed
Oct 21, 2010 at 12:28 UTC
9a40fcc2014cc4a85eca71f81ff4c86d49b7a9e2
1 file changed
+7
-7
git-subtree.txt
+7
-7
@@ -9,11 +9,11 @@ git-subtree - Merge subtrees together and split repository into subtrees
9
SYNOPSIS
10
--------
11
[verse]
12
-'git subtree' add -P <prefix>|--prefix=<prefix> <commit>
13
-'git subtree' pull -P <prefix>|--prefix=<prefix> <repository> <refspec...>
14
-'git subtree' push -P <prefix>|--prefix=<prefix> <repository> <refspec...>
15
-'git subtree' merge -P <prefix>|--prefix=<prefix> <commit>
16
-'git subtree' split -P <prefix>|--prefix=<prefix> [OPTIONS] [<commit>]
12
+'git subtree' add -P <prefix> <commit>
13
+'git subtree' pull -P <prefix> <repository> <refspec...>
14
+'git subtree' push -P <prefix> <repository> <refspec...>
15
+'git subtree' merge -P <prefix> <commit>
16
+'git subtree' split -P <prefix> [OPTIONS] [<commit>]
17
18
19
DESCRIPTION
@@ -34,9 +34,9 @@ work. A subtree is just a subdirectory that can be
34
committed to, branched, and merged along with your project in
35
any way you want.
36
37
-They are neither not to be confused with using the subtree merge
37
+They are also not to be confused with using the subtree merge
38
strategy. The main difference is that, besides merging
39
-of the other project as a subdirectory, you can also extract the
39
+the other project as a subdirectory, you can also extract the
40
entire history of a subdirectory from your project and make it
41
into a standalone project. Unlike the subtree merge strategy
42
you can alternate back and forth between these