git-svn and cherry picking - chrisortman

"git cherry-pick -n $SHA What this will do is stage the changes but not commit. Now I can git-commit myself and remove the git-svn-id line."