原理

image.png

使用方法

git rebase -i master
image.png

  1. 调整顺序

image.png

  1. 合并

image.png

  1. 丢弃提交

image.png

应用

  1. 整合提交历史

image.png
例子，修改历史提交信息，修改dit-leetcode为dir-leetcode

  1. demonfox@ubuntu:~/linux-cpp$ git log
  2. commit de88d5a96305a0424734f92278156d9dfd8ab551
  3. Author: 9DemonFox <1196752479@qq.com>
  4. Date:   Mon May 23 08:11:49 2022 -0700
  6. -dit-leetcode 增加二叉树相关，以及leetcode1302
  8. commit d720a23e9629347b2f249ec70f984e3f16a68f76
  9. Author: DemonFox <1196752479@qq.com>
  10. Date:   Fri May 20 13:34:07 2022 +0800
  12. -dir-leetcode small changes
  14. commit a4f6b9b8d2b29c6a73956d882bd004f99b3bffde
  15. Author: 9DemonFox <1196752479@qq.com>
  16. Date:   Thu May 19 22:24:34 2022 -0700
  18. 增加leetcode文件夹用于练习算法
  20. commit 811cd8b86a9a4bab248dbbb41476adbe459e1454
  21. Author: 9DemonFox <1196752479@qq.com>
  22. Date:   Sun Mar 27 22:54:35 2022 -0700
  24. 修改oj支持多副本
  26. demonfox@ubuntu:~/linux-cpp$ git rebase -i HEAD~2
  27. Cannot rebase: Your index contains uncommitted changes.
  28. Please commit or stash them.
  29. demonfox@ubuntu:~/linux-cpp$ git commit -m "暂存"
  30. [master eb85efa] 暂存
  31. 20 files changed, 509 insertions(+), 1 deletion(-)
  32. create mode 100644 .clang-format
  33. create mode 100644 leetcode/101Template/main.cpp
  34. create mode 100644 leetcode/4TreeSearch/574/copy.txt
  35. create mode 100755 leetcode/4TreeSearch/574/excute
  36. create mode 100644 leetcode/4TreeSearch/574/inputs/1.txt
  37. create mode 100644 leetcode/4TreeSearch/574/inputs/2.txt
  38. create mode 100644 leetcode/4TreeSearch/574/makefile
  39. create mode 100644 leetcode/4TreeSearch/574/test.cpp
  40. create mode 100644 leetcode/4TreeSearch/993/copy.txt
  41. create mode 100755 leetcode/4TreeSearch/993/excute
  42. create mode 100644 leetcode/4TreeSearch/993/inputs/1.txt
  43. create mode 100644 leetcode/4TreeSearch/993/inputs/2.txt
  44. create mode 100644 leetcode/4TreeSearch/993/inputs/3.txt
  45. create mode 100644 leetcode/4TreeSearch/993/inputs/4.txt
  46. create mode 100644 leetcode/4TreeSearch/993/makefile
  47. create mode 100644 leetcode/4TreeSearch/993/test.cpp
  48. create mode 100644 tricks/bitmap/main.cpp
  49. demonfox@ubuntu:~/linux-cpp$ git rebase -i HEAD~2
  50. Successfully rebased and updated refs/heads/master.
  51. demonfox@ubuntu:~/linux-cpp$ git rebase -i HEAD~2
  52. Stopped at de88d5a96305a0424734f92278156d9dfd8ab551... -dit-leetcode 增加二叉树相关，以及leetcode1302
  53. You can amend the commit now, with
  55. git commit --amend 
  57. Once you are satisfied with your changes, run
  59. git rebase --continue
  61. demonfox@ubuntu:~/linux-cpp$ git commit --amend
  62. [detached HEAD 1c7b9d3] -dir-leetcode 增加二叉树相关，以及leetcode1302
  63. Date: Mon May 23 08:11:49 2022 -0700
  64. 10 files changed, 220 insertions(+), 1 deletion(-)
  65. create mode 100644 leetcode/4TreeSearch/1302/copy.txt
  66. create mode 100755 leetcode/4TreeSearch/1302/excute
  67. create mode 100644 leetcode/4TreeSearch/1302/inputs/1.txt
  68. create mode 100644 leetcode/4TreeSearch/1302/makefile
  69. create mode 100644 leetcode/4TreeSearch/1302/test.cpp
  70. create mode 100644 leetcode/tools/bitree.cpp
  71. create mode 100644 leetcode/tools/bitree.h
  72. create mode 100644 leetcode/tools/makefile
  73. create mode 100644 leetcode/tools/utest_bitree.cpp
  74. demonfox@ubuntu:~/linux-cpp$ git rebase --continue
  75. Successfully rebased and updated refs/heads/master.
  76. demonfox@ubuntu:~/linux-cpp$ git log
  77. commit f7901179dec12c478e55b4563eebe07ba5816487
  78. Author: 9DemonFox <1196752479@qq.com>
  79. Date:   Mon May 30 09:44:40 2022 -0700
  81. 暂存
  83. commit 1c7b9d36eb73e3a23e1ba36273394627a90a9646
  84. Author: 9DemonFox <1196752479@qq.com>
  85. Date:   Mon May 23 08:11:49 2022 -0700
  87. -dir-leetcode 增加二叉树相关，以及leetcode1302
  89. commit d720a23e9629347b2f249ec70f984e3f16a68f76
  90. Author: DemonFox <1196752479@qq.com>
  91. Date:   Fri May 20 13:34:07 2022 +0800
  93. -dir-leetcode small changes
  95. commit a4f6b9b8d2b29c6a73956d882bd004f99b3bffde
  96. Author: 9DemonFox <1196752479@qq.com>
  97. Date:   Thu May 19 22:24:34 2022 -0700
  99. 增加leetcode文件夹用于练习算法
  101. :...skipping...
  102. commit f7901179dec12c478e55b4563eebe07ba5816487
  103. Author: 9DemonFox <1196752479@qq.com>
  104. Date:   Mon May 30 09:44:40 2022 -0700
  106. 暂存
  108. commit 1c7b9d36eb73e3a23e1ba36273394627a90a9646
  109. Author: 9DemonFox <1196752479@qq.com>
  110. Date:   Mon May 23 08:11:49 2022 -0700
  112. -dir-leetcode 增加二叉树相关，以及leetcode1302
  114. commit d720a23e9629347b2f249ec70f984e3f16a68f76
  115. Author: DemonFox <1196752479@qq.com>
  116. Date:   Fri May 20 13:34:07 2022 +0800
  118. -dir-leetcode small changes
  120. commit a4f6b9b8d2b29c6a73956d882bd004f99b3bffde
  121. Author: 9DemonFox <1196752479@qq.com>
  122. Date:   Thu May 19 22:24:34 2022 -0700
  124. 增加leetcode文件夹用于练习算法
  126. commit 811cd8b86a9a4bab248dbbb41476adbe459e1454
  127. Author: 9DemonFox <1196752479@qq.com>
  128. Date:   Sun Mar 27 22:54:35 2022 -0700
  130. 修改oj支持多副本
  132. commit 45b5f505488194edd413ce799425bf84ee270eb8
  133. Author: 9DemonFox <1196752479@qq.com>
  134. Date:   Sun Mar 27 10:59:40 2022 -0700
  136. 增加oj，方便练习题目
  138. commit 039b2b1cc736a9ccc4a205444914a5419def6345
  139. Author: 9DemonFox <1196752479@qq.com>
  140. demonfox@ubuntu:~/linux-cpp$

整理分支后通常需要使用git push -f来覆盖远程分支

有两种情况下适合使用这个命令：

确定需要覆覆盖提交，就像上面的那种情况，在明确部分提交会导致异常时，可以使用新的提交去覆盖。
需要整理历史提交记录时，有时候项目的 Commit Logs 可能比较乱，不能清晰的看出每一次提交的作用，可以使用 rebase 命令来清理历史提交记录。因为改变了历史，所以正常来说是 push不成功的，所以需要使用 force push来解决这个问题。