Git的问题 - rebase/squash

Question

我正在尝试在git存储库中压缩一些提交.

> git rebase -i HEAD~3

Successfully rebased and updated refs/heads/staging.

文件打开标题为git-rebase-todo:

pick a2f3467 Require statement incorrect
pick c41212e Require file in environment
pick 2743221 This should work

# Rebase c5f42f3..2743221 onto c5f42f3
# ..........

我尝试将底部的两个提交更改squash为pick.我保存文件,我收到以下错误:

Unable to save ~/Documents/code/myapp/.git/rebase-emrge/git-rebase-todo

Answer 1

问题是当启动sublimetext2时,它不会阻塞并立即返回.然后Git认为你已经完成了编辑文件并执行了rebase.这就是你看到的原因

Successfully rebased and updated refs/heads/staging

消息,甚至在编辑文件之前.请改用subl命令,该命令专为此类用途而设计.在GitHub的帮助,告诉你用它配置

git config --global core.editor "subl -n -w"