Eclipse Git | 还原合并提交

Question

Using Eclipse Git (the one bundled by default on Eclipse Mars.1 - JavaEE version), is it still possible to remove/delete a wrong merge commit?

Since I'm still new to the UI of Eclipse Git coming from a terminal user, I accidentally merge the wrong branch dev-release to a dev-master . Which should have been the other way around. Luckily I haven't pushed yet that merge commit to remote.

My question is, is it possible to undo the merge commit using Eclipse Git only?

Git history

Current situation

dev-release      E - F - G 
               /           \
dev-master   A - B - C - D - H

Expected result

dev-release      E - F - G - H 
               /           /
dev-master   A - B - C - D 

Answer 1

您应该能够硬重置dev-master以从“ 历史记录”视图中提交D ，然后根据需要在dev-release上重做合并。