Added git-svn-merge to my bag of tricks