Git合并多次提交记录

一、首先在终端输入查看git log命令查看提交的历史记录,默认只显示两条提交纪录,可按回车键显示多条纪录.

二、然后复制合并前的一次提交记录的前9位hash值2565ds565,在终端输入:git  rebase -i 2565ds565 进行合并

三、然后就会进入历史提交的编辑页面

1. pick acf6d24 第二次提交

2. pick 0353373 第三次提交

3.  

4. # Rebase 2169bc5..0353373 onto 2169bc5 (2 commands)

5. #

6. # Commands:

7. # p, pick = use commit

8. # r, reword = use commit, but edit the commit message

9. # e, edit = use commit, but stop for amending

10. # s, squash = use commit, but meld into previous commit

11. # f, fixup = like "squash", but discard this commit's log message

12. # x, exec = run command (the rest of the line) using shell

13. # d, drop = remove commit

14. #

15. # These lines can be re-ordered; they are executed from top to bottom.

16. #

17. # If you remove a line here THAT COMMIT WILL BE LOST.

18. #

19. # However, if you remove everything, the rebase will be aborted.

20. #

21. # Note that empty commits are commented out

22.  

可以看到第2次和第3次的提交消息，并且是从old->new来排序的。我们需要把第3次提交合并到第2次上。使用squash.

也就是把第三次提交的pick 换成squash,然后保存文件即可完成第二次和第三次提交纪录的合并为一次,再次输入git log查看提交历史纪录,可见已合并为一次了.参考https://www.cnblogs.com/woshimrf/p/git-rebase.html