git中利用rebase来压缩多次提交原文：https://blog.csdn.net/itfootball/article/details/44154121...

之前我们用git merge –squash来将分支中多次提交合并到master后&＃xff0c;只保留一次提交历史。但是有些提交到github远程仓库中的commit信息如何合并呢&＃xff1f;

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

git rebase -i HEAD~4

该命令执行后&＃xff0c;会弹出vim的编辑窗口&＃xff0c;4次提交的信息会倒序排列&＃xff0c;最上面的是第四次提交&＃xff0c;最下面的是最近一次提交。

我们需要修改第2-4行的第一个单词pick为squash&＃xff0c;这个意义为将最后三次的提交压缩到倒数第四次的提交&＃xff0c;效果就是我们在pick所在的提交就已经做了4次动作&＃xff0c;但是看起来就是一次而已&＃xff1a;

然后我们保存退出&＃xff0c;git会一个一个压缩提交历史&＃xff0c;如果有冲突&＃xff0c;需要修改&＃xff0c;修改的时候要注意&＃xff0c;保留最新的历史&＃xff0c;不然我们的修改就丢弃了。修改以后要记得敲下面的命令&＃xff1a;

git add .
git rebase --continue

如果你想放弃这次压缩的话&＃xff0c;执行以下命令&＃xff1a;

git rebase --abort

如果所有冲突都已经解决了&＃xff0c;会出现如下的编辑窗口&＃xff1a;

这个时候我们需要修改一下合并后的commit的描述信息&＃xff0c;我们将其描述为helloworld吧&＃xff1a;

保存退出后会看到我们完整的信息&＃xff1a;

$ git rebase -i HEAD~4
[detached HEAD 9097684] helloworldAuthor: xuxu 126.com>Committer: unknown &＃64;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&＃64;example.com After doing this, you may fix the identity used for this commit with: git commit --amend --reset-author 9 files changed, 25 insertions(&＃43;), 11 deletions(-) Successfully rebased and updated refs/heads/master.




同步到远程仓库

那么这个时候我们的github上的信息又是如何呢&＃xff1f;

github上的提交历史还是之前的&＃xff0c;如何更新我们压缩后的历史记录呢&＃xff1f;

我们采用git push 试试:

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

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

$ git push -f
warning: push.default is unset; its implicit value is changing in
Git 2.0 from &＃39;matching&＃39; to &＃39;simple&＃39;. 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 &＃39;matching&＃39;, 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 &＃39;simple&＃39; behavior, which only pushes the current branch to the corresponding remote branch that &＃39;git pull&＃39; uses to update the current branch. See &＃39;git help config&＃39; and search for &＃39;push.default&＃39; for further information. (the &＃39;simple&＃39; mode was introduced in Git 1.7.11. Use the similar mode &＃39;current&＃39; instead of &＃39;simple&＃39; if you sometimes use older versions of Git) Counting objects: 1, done. Writing objects: 100% (1/1), 232 bytes | 0 bytes/s, done. Total 1 (delta 0), reused 0 (delta 0) To https://github.com/DoctorQ/AndroidTestScrpits.git &＃43; 415a0be...9097684 master -> master (forced update)