summaryrefslogtreecommitdiff
path: root/_posts
diff options
context:
space:
mode:
authortekkub <tekkub@gmail.com>2010-03-03 01:45:55 -0700
committertekkub <tekkub@gmail.com>2010-03-03 01:45:55 -0700
commit8e5bc30f4d5f019bbad5fb7fe3521b63ed7b7f27 (patch)
tree198fcbcbbe11675c59e99b8452d36b82c589d490 /_posts
parent0226ab11c470415199ba49bcc5e4067708e33ac0 (diff)
New section!
Diffstat (limited to '_posts')
-rw-r--r--_posts/2009-09-27-splitting-a-subpath-to-a-new-repo.textile2
-rw-r--r--_posts/2009-10-10-subtree-merge.textile2
2 files changed, 2 insertions, 2 deletions
diff --git a/_posts/2009-09-27-splitting-a-subpath-to-a-new-repo.textile b/_posts/2009-09-27-splitting-a-subpath-to-a-new-repo.textile
index 806943e..0013d16 100644
--- a/_posts/2009-09-27-splitting-a-subpath-to-a-new-repo.textile
+++ b/_posts/2009-09-27-splitting-a-subpath-to-a-new-repo.textile
@@ -2,7 +2,7 @@
layout: default
title: Splitting a subpath out into a new repo
description: How to generate a new repo from a subpath, retaining history.
-categories: repos
+categories: "Git ninjutsu"
---
From time to time you may find that you want to make a new repo from a subpath of an existing repo. Perhaps you're moving some code out into a library or just want to have a common submodule across projects. Thanks to git, it's easy to do this without losing the history of that subpath in the process.
diff --git a/_posts/2009-10-10-subtree-merge.textile b/_posts/2009-10-10-subtree-merge.textile
index ab4fddc..b9d7474 100644
--- a/_posts/2009-10-10-subtree-merge.textile
+++ b/_posts/2009-10-10-subtree-merge.textile
@@ -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: repos
+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.