git reset

撤销操作：

1. 首先用git reflog显示当前分支的操作历史：

437b4dd (HEAD -> b1, master) HEAD@{0}: rebase finished: returning to refs/heads/b1
437b4dd (HEAD -> b1, master) HEAD@{1}: rebase: checkout master
06859d9 HEAD@{2}: reset: moving to HEAD@{2}
437b4dd (HEAD -> b1, master) HEAD@{3}: rebase finished: returning to refs/heads/b1
437b4dd (HEAD -> b1, master) HEAD@{4}: rebase: checkout master
06859d9 HEAD@{5}: checkout: moving from master to b1
437b4dd (HEAD -> b1, master) HEAD@{6}: merge b1: Merge made by the 'recursive' strategy.
2f6489c HEAD@{7}: commit: modify merge
4edf54a HEAD@{8}: checkout: moving from b1 to master
06859d9 HEAD@{9}: commit: modify
ab284c1 HEAD@{10}: checkout: moving from master to b1
4edf54a HEAD@{11}: commit: add merger test

2. 使用 git reset --hard 06859d9   或者git reset --hard HEAD@{5} 命令，均衡将HEAD重置，相当于回滚