Recover history from silly git-svn merge

Question

players:

master: svn branch (actual, not local scrolling) mybranch: local branch

My mistake:

[master] git svn rebase
[master] git merge mybranch
[master] git svn dcommit

I have done it twice.

Is there any way to fix all this? I thought something like:

• git checkout --hard [commit before merge]
• git dcommit # what for svn?
• git rebase mybranch
• git dcommit

But this does not seem to work.

(I know that I have to work with the local tracking branch and b) reinstall, not merge)

I am in a frantic state / ready to send beer to the stage of the respondents :)

Answer 1

SVN , dcommit , , ?

git log # grab the commit hash you want to revert
git revert <commit hash>
git svn dcommit

git revert

, , , , .