git svn: use rebase --rebase-merges instead of preserve-merges#295

dscho wants to merge 1 commit intogitgitgadget:mastergitgitgadget/git:masterfrom

dscho:use-rebase-r-in-git-svndscho/git:use-rebase-r-in-git-svnCopy head branch name to clipboard