return to OCLUG Web Site
A Django site.
May 1, 2009

Bart Trojanowski
jukie
Bart's Blog
» splitting files out of a commit

I previously wrote on splitting patches with git. This is very similar but deals with removing a file from a commit.

[Read More]

November 12, 2008

Bart Trojanowski
jukie
Bart's Blog
» splitting patches with git

Here is a really cool workflow using git...

Say you have several commits (you can think of them as patches for this exercise) in your current repository and want to split one into multiple parts. There could be various reaons like upstream request, only want to release part of it, remove debug code, etc.

Anyway, there is one commit in your unpublished history that needs to be split.

[Read More]

March 4, 2008

Bart Trojanowski
jukie
Bart's Blog
» how to track multiple svn branches in git

I must say that I am no fan SVN, but SVN and I get a long a lot better since I started using git-svn. Long ago a good friend of mine, Dave O'Neill, taught me how to handle multiple branches using git-svn. I had used that technique until Dave taught me how to do it better.

Recently I saw this blog post which referenced Dave's article talking about the first method. I guess Dave never got around to updating his blog with the better way. So I am going to do that here:

[Read More]