如何使用 git 重置来编辑旧提交

Question

1) Is there a way to edit or squash commits without using the Interactive mode of git rebase? 2) How do git reset --keep and git reset --merge work and how do they differ? I have read the git book, but I do not understand it yet...

Answer 1

You can do

git reset --soft <commit>
git commit -m "squashed"

to squash all commits between your current HEAD and <commit> .

The git reset part undos all commits that came after <commit> but will keep the changes staged (you can check this with git status ). The subsequent git commit will commit all those staged changes as a single commit.