diff options
| author | Brandon Tilley <binarymuse@binarymuse.net> | 2010-08-31 11:31:58 -0700 |
|---|---|---|
| committer | Brandon Tilley <binarymuse@binarymuse.net> | 2010-08-31 11:31:58 -0700 |
| commit | 6ceb603870b2375636075bfbf1749c9008f66a70 (patch) | |
| tree | 267781f26ee81edc524cbaaf0d0992dbf41c10b8 | |
| parent | 899cdb6a8152c6752036856882ad32da17a5f521 (diff) | |
Minor spelling mistake fix
| -rw-r--r-- | _posts/2009-10-10-subtree-merge.textile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/_posts/2009-10-10-subtree-merge.textile b/_posts/2009-10-10-subtree-merge.textile index c2b3fd3..4fcaa9f 100644 --- a/_posts/2009-10-10-subtree-merge.textile +++ b/_posts/2009-10-10-subtree-merge.textile @@ -5,7 +5,7 @@ description: How to use subtree merge to merge one repo into another as a subpat categories: git_ninjutsu --- -There are times when submodules are not adequate for the task at hand. For example, blending multiple repos together into one single repo while still maintaining the histor of each repo. To do this, the subtree merge strategy is a better solution. +There are times when submodules are not adequate for the task at hand. For example, blending multiple repos together into one single repo while still maintaining the history of each repo. To do this, the subtree merge strategy is a better solution. h2. Setting up and doing the first merge |