GIT rebase - 多個提交到一個 - 仍在歷史中看到

Question

我試圖從多個提交（它已被推送到起源/主）作出一個提交。

我從本教程嘗試它： https://feeding.cloud.geek.nz/posts/combining-multiple-commits-into-one/

$ git log --oneline 
c172641 Fix second file 
24f5ad2 Another file 
97c9d7d Add first file 
we can combine the last two commits (c172641 and 24f5ad2) by rebasing up to the first commit: 

$ git rebase -i 97c9d7d 
and specify the following commands in the interactive rebase screen: 

pick 24f5ad2 Another file 
squash c172641 Fix second file 
which will rewrite the history into this: 

$ git log --oneline 
1a9d5e4 Another file 
97c9d7d Add first file 

這工作不錯，直到我把它推到原點/主。

$ git pull 
$ git push origin master 
$ git log --oneline 

RESULT IS: 
******* Merge branch master... 
******* THAT REBASE name... 
c172641 Fix second file 
24f5ad2 Another file 
97c9d7d Add first file 

但我想這樣的結果：

$ git log --oneline 
1a9d5e4 Another file 
97c9d7d Add first file 

這可能嗎？

Answer 1

在這種情況下，你可能想力推而不是拉&推

$ git log --oneline 
1a9d5e4 Another file 
97c9d7d Add first file 

$ git push -f origin master 

通知：rebase + force push覆蓋歷史，慎用公共分支使用。