急！！生产环境下git操作失误！ 生产环境下新的代码commit后，想把它放入git repository.

git push origin master

! [rejected] master -> master (non-fast-forward)
error: failed to push some refs to
To prevent you from losing history, non-fast-forward updates were rejected
Merge the remote changes (e.g. 'git pull') before pushing again. See the
'Note about fast-forwards' section of 'git push --help' for details.

于是手贱，打了：git fetch origin;git merge origin/master
这条命令做了很多自动的merge. 服务完全瘫痪！！！！

我该如何恢复到之前？？？？