summaryrefslogtreecommitdiff
path: root/_posts/2009-10-10-subtree-merge.markdown
diff options
context:
space:
mode:
authorCameron McEfee <cameron@github.com>2011-05-27 14:01:53 -0700
committerCameron McEfee <cameron@github.com>2011-05-27 14:01:53 -0700
commit1771997794464b56d0e58317260093e98aabda1b (patch)
tree10040909d8d7ca618983e017815c7b990438c7a5 /_posts/2009-10-10-subtree-merge.markdown
parent4e9c4c8ca65dd32a4616cc3711f8d24927341139 (diff)
add new categories
Diffstat (limited to '_posts/2009-10-10-subtree-merge.markdown')
-rw-r--r--_posts/2009-10-10-subtree-merge.markdown2
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 ab3ef49..3c50e76 100644
--- a/_posts/2009-10-10-subtree-merge.markdown
+++ b/_posts/2009-10-10-subtree-merge.markdown
@@ -2,7 +2,7 @@
layout: default
title: Working with subtree merge
description: How to use subtree merge to merge one repo into another as a subpath.
-categories: git_ninjutsu
+categories: advanced
---
<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>