利用rebase来压缩多次提交

时间:2024-01-13 16:56:20

我们可以用Git merge –squash来将分支中多次提交合并到master后,只保留一次提交历史。但是有些提交到github远程仓库中的commit信息如何合并呢?

历史记录

首先我们查看一下master分支的提交历史:

$ git log
commit 415a0be986a48113829b3c60ee2387c6dbdc81d8
Author: xuxu <xuxu_1988@.com>
Date: Mon Jan :: + -> commit ed09a6cbe0797275ceead3f8c8d829d01f0e604b
Author: xuxu <xuxu_1988@.com>
Date: Mon Jan :: + 2015.01. commit 1821f6a1c1ed074fe886228cf33b3b3cb71819c4
Author: xuxu <xuxu_1988@.com>
Date: Mon Jan :: + 2015.01. commit cc779982fc61e82ec494d6a5654417fa7194d748
Author: xuxu <xuxu_1988@.com>
Date: Mon Jan :: + 2015.1.

我们看到上面有四次commit,如何将这个四次合并到一次呢?

压缩

使用下面的命令,最后一个数字4代表压缩最后四次提交。

git rebase -i HEAD~

该命令执行后,会弹出vim的编辑窗口,4次提交的信息会按照提交时间顺序排列,最上面的是最早一次提交,最下面的是最近一次提交。

利用rebase来压缩多次提交

我们需要修改第2-4行的第一个单词pick为squash,意思就是将下面的三次提交压缩到第一行中去,效果就是我们在pick所在的提交就已经做了4次动作,但是看起来就是一次而已。
注意:并不会删除下面的三次提交内容,只会将四次提交压缩为一次。

利用rebase来压缩多次提交

然后我们保存退出,git会一个一个压缩提交历史。

如果有冲突,需要修改,修改的时候要注意,保留最新的历史,不然我们的修改就丢弃了。修改以后要记得敲下面的命令:

git add .
git rebase --continue

如果你想放弃这次压缩的话,执行以下命令:

git rebase --abort

如果所有冲突都已经解决了,会出现如下的编辑窗口:

利用rebase来压缩多次提交

这个时候我们需要修改一下合并后的commit的描述信息,我们将其描述为helloworld吧:

利用rebase来压缩多次提交

保存退出后会看到我们完整的信息:

$ git rebase -i HEAD~
[detached HEAD ] helloworld
Author: xuxu <xuxu_1988@.com>
Committer: unknown <hui.qian@HuiQianPC.spreadtrum.com>
Your name and email address were configured automatically based
on your username and hostname. Please check that they are accurate.
You can suppress this message by setting them explicitly: git config --global user.name "Your Name"
git config --global user.email you@example.com After doing this, you may fix the identity used for this commit with: git commit --amend --reset-author files changed, insertions(+), deletions(-)
Successfully rebased and updated refs/heads/master.

现在我们来查看一下历史:

$ git log
commit 90976848524251b0a62376a9e45ea5c8aae25d87
Author: xuxu <xuxu_1988@.com>
Date: Mon Jan :: + helloworld commit f57da9460196b950036fe4c2c8f7e4c9131ee04e
Author: xuxu <xuxu_1988@.com>
Date: Mon Jan :: + 2015.01. commit 64104e057f48d6dd0e432af8b55cbccd0a09ee63
Author: xuxu <xuxu_1988@.com>
Date: Mon Jan :: + 2015.01. commit 8499d4fa23c4395660d21e0b7dca873a7a3ef2b8
Author: xuxu <xuxu_1988@.com>
Date: Mon Jan :: + 2015.01.

提交历史很清楚的显示出了我们的压缩成功了。

同步到远程仓库

github上的提交历史还是之前的,如何更新我们压缩后的历史记录呢?

我们采用git push 试试:

To https://github.com/DoctorQ/AndroidTestScrpits.git
! [rejected] master -> master (non-fast-forward)
error: failed to push some refs to 'https://github.com/DoctorQ/AndroidTestScrpit
s.git'
hint: Updates were rejected because the tip of your current branch is behind
hint: its remote counterpart. Integrate the remote changes (e.g.
hint: 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.

被拒绝了,因为我们合并的历史记录已经在远程仓库之前了,你无法覆盖它。
那怎么办?如果你确定你的合并过程都是正确无误的,那么就可以强制push:

$ git push -f
warning: push.default is unset; its implicit value is changing in
Git 2.0 from 'matching' to 'simple'. To squelch this message
and maintain the current behavior after the default changes, use: git config --global push.default matching To squelch this message and adopt the new behavior now, use: git config --global push.default simple When push.default is set to 'matching', git will push local branches
to the remote branches that already exist with the same name. In Git 2.0, Git will default to the more conservative 'simple'
behavior, which only pushes the current branch to the corresponding
remote branch that 'git pull' uses to update the current branch. See 'git help config' and search for 'push.default' for further information.
(the 'simple' mode was introduced in Git 1.7.. Use the similar mode
'current' instead of 'simple' if you sometimes use older versions of Git) Counting objects: , done.
Writing objects: % (/), bytes | bytes/s, done.
Total (delta ), reused (delta )
To https://github.com/DoctorQ/AndroidTestScrpits.git
+ 415a0be... master -> master (forced update)

OK,不出意外的话,打开gitlab应该可以看到结果了。