diff options
| author | Cameron McEfee <cameron@github.com> | 2011-05-16 14:07:48 -0700 |
|---|---|---|
| committer | Cameron McEfee <cameron@github.com> | 2011-05-16 16:55:31 -0700 |
| commit | a483a05335c753555aba8c4529a62eb50b470028 (patch) | |
| tree | 13309e7ff7b36f6020390e19067ff2251e26456d /_posts/2009-10-10-subtree-merge.markdown | |
| parent | b9e8a41be8370615b233e01da697d1e6cba0b3f6 (diff) | |
Update files to match new style guide
Diffstat (limited to '_posts/2009-10-10-subtree-merge.markdown')
| -rw-r--r-- | _posts/2009-10-10-subtree-merge.markdown | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/_posts/2009-10-10-subtree-merge.markdown b/_posts/2009-10-10-subtree-merge.markdown index 53754e0..ab3ef49 100644 --- a/_posts/2009-10-10-subtree-merge.markdown +++ b/_posts/2009-10-10-subtree-merge.markdown @@ -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 history of each repo. To do this, the subtree merge strategy is a better solution. +<p class="intro">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.</p> Setting up and doing the first merge ------------------------------------ |