git-svn and cherry picking - chrisortman
http://codeprairie.net/blogs/chrisortman/archive/2008/04/08/git-svn-and-cherry-picking.aspx
"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."