diff options
| -rw-r--r-- | _layouts/default.html | 1 | ||||
| -rw-r--r-- | _posts/2009-09-27-splitting-a-subpath-to-a-new-repo.textile | 2 | ||||
| -rw-r--r-- | _posts/2009-10-10-subtree-merge.textile | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/_layouts/default.html b/_layouts/default.html index 3844c08..a8ba406 100644 --- a/_layouts/default.html +++ b/_layouts/default.html @@ -4,6 +4,7 @@ sidebar_cats: - troubleshooting - repos - "Everyday git" +- "Git ninjutsu" - collaborating - deploying - mac 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. |