From 6ceb603870b2375636075bfbf1749c9008f66a70 Mon Sep 17 00:00:00 2001
From: Brandon Tilley <binarymuse@binarymuse.net>
Date: Tue, 31 Aug 2010 11:31:58 -0700
Subject: Minor spelling mistake fix

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

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

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

