diff options
| author | Avery Pennarun <apenwarr@gmail.com> | 2010-10-21 12:28:18 -0700 |
|---|---|---|
| committer | Avery Pennarun <apenwarr@gmail.com> | 2010-10-21 12:28:18 -0700 |
| commit | 9a40fcc2014cc4a85eca71f81ff4c86d49b7a9e2 (patch) | |
| tree | def868cb64f77c28a16ce4df3df0445a04ba1071 | |
| parent | 7f86ff0fe292a5061757f3ceaffdd992c5feaa9f (diff) | |
| download | git-9a40fcc2014cc4a85eca71f81ff4c86d49b7a9e2.tar.gz | |
Fix a few typos/grammar-o's in the preceding commit.
| -rw-r--r-- | git-subtree.txt | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/git-subtree.txt b/git-subtree.txt index 18a9af501f..0c44fda011 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>|--prefix=<prefix> <commit> -'git subtree' pull -P <prefix>|--prefix=<prefix> <repository> <refspec...> -'git subtree' push -P <prefix>|--prefix=<prefix> <repository> <refspec...> -'git subtree' merge -P <prefix>|--prefix=<prefix> <commit> -'git subtree' split -P <prefix>|--prefix=<prefix> [OPTIONS] [<commit>] +'git subtree' add -P <prefix> <commit> +'git subtree' pull -P <prefix> <repository> <refspec...> +'git subtree' push -P <prefix> <repository> <refspec...> +'git subtree' merge -P <prefix> <commit> +'git subtree' split -P <prefix> [OPTIONS] [<commit>] 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 |