您可以使用交互式 rebase 和挤压提交 - 另见 Git准备教程通过重组压扁。对不起，只是转储一个链接，但这是一个非常彻底的教程。哦，这也会压缩你的合并。

You can use interactive rebase and "squash" the commits -- see also the Git Ready Tutorial on squashing via rebase. Sorry to just dump a link on you but that's a pretty thorough tutorial. Oh, and this will also squash away your merges just fine.