如何在同一个提交的rebase之后恢复合并提交？

Question

假设这样的：

mkdir test; cd test 
echo "1" > file1; git init; git add .; git commit -m "initial - file 1" # 1st commit on master 
echo "2" > file2; git add .; git commit -m "file 2"      # 2nd commit on master 
git checkout -b newbranch             # creates newbranch 
echo "1" >> file1; git add .; git commit -m "changed 1"     # 1st commit on newbranch 
git checkout master              # goes to master 
echo "2" >> file2; git add .; git commit -m "changed 2"     # 3rd commit on master 
git merge newbranch -m "merge commit"          # merge newbranch on master 
echo "3" > file3; git add .; git commit --amend -m "merge commit"   # amend merge commit and adds file3 
git rebase HEAD~2               # don't change anything, just leave 
ls                  # there isn't file3 anymore! 

有没有办法恢复合并提交，以便进行修改就可以了，这些变化不会丢失？

Answer 1

您所做的更改仍在reflog中。

经过意外重建（我认为这是偶然的，因为您在谈论“丢失”提交），请运行git reflog。

在最上面的集合中找到刚刚在最后一个“rebase：”行下面的条目。左侧的提交散列是在开始重新绑定之前修改的合并提交。