From 1771997794464b56d0e58317260093e98aabda1b Mon Sep 17 00:00:00 2001
From: Cameron McEfee <cameron@github.com>
Date: Fri, 27 May 2011 14:01:53 -0700
Subject: add new categories

---
 _posts/2009-10-10-subtree-merge.markdown | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to '_posts/2009-10-10-subtree-merge.markdown')

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>
-- 
cgit v1.3.1