使用git rebase。具体地说:

Use git stash to store the changes you want to add. Use git rebase -i HEAD~10 (or however many commits back you want to see). Mark the commit in question (a0865...) for edit by changing the word pick at the start of the line into edit. Don't delete the other lines as that would delete the commits.[^vimnote] Save the rebase file, and git will drop back to the shell and wait for you to fix that commit. Pop the stash by using git stash pop Add your file with git add <file>. Amend the commit with git commit --amend --no-edit. Do a git rebase --continue which will rewrite the rest of your commits against the new one. Repeat from step 2 onwards if you have marked more than one commit for edit.

[^vimnote]:如果你正在使用vim，那么你必须按Insert键进行编辑，然后按Esc键，输入:wq保存文件，退出编辑器，并应用更改。或者，你也可以使用git config——global core配置一个用户友好的git提交编辑器。编辑“纳米”。

另外，如果你使用git rebase -i，并且想要去当前分支的第一次提交，你可以使用git rebase -i——root。现在您可以轻松地修改第一次提交。

下面是一个实现@Greg答案的函数:

function gitamendoldcommit() {
    printf "\n\nPress any key if you have no changes other than those you want to add to $1."
    printf "(You can commit your unwanted changes and undo later.):\n\n"
    read foo
    printf "\n\nChange 'pick' to 'edit' in front of $1 (top one), save, close the editor & press any key..."
    printf "Resolve any possible conflicts, if any. then: git add .; git rebase --continue\n\n"
    git rebase -i $1^

    git stash pop
    git add .
    git commit --amend --no-edit
    git rebase --continue
}

用法:(当在staging中只有预期的更改时)gitamendoldcommit $OLDCOMMIT

用一个小的改变来“修复”一个旧的提交，而不改变旧提交的提交消息，其中OLDCOMMIT类似于091b73a:

git add <my fixed files>
git commit --fixup=OLDCOMMIT
git rebase --interactive --autosquash OLDCOMMIT^

你也可以使用git commit——squash=OLDCOMMIT在改基期间编辑旧的提交消息。

参见git commit和git rebase的文档。和往常一样，在重写git历史记录时，你应该只修复或压缩你还没有发布给任何人的提交(包括随机的互联网用户和构建服务器)。

详细解释

git commit --fixup=OLDCOMMIT copies the OLDCOMMIT commit message and automatically prefixes fixup! so it can be put in the correct order during interactive rebase. (--squash=OLDCOMMIT does the same but prefixes squash!.) git rebase --interactive will bring up a text editor (which can be configured) to confirm (or edit) the rebase instruction sequence. There is info for rebase instruction changes in the file; just save and quit the editor (:wq in vim) to continue with the rebase. --autosquash will automatically put any --fixup=OLDCOMMIT commits in the correct order. Note that --autosquash is only valid when the --interactive option is used. The ^ in OLDCOMMIT^ means it's a reference to the commit just before OLDCOMMIT. (OLDCOMMIT^ is the first parent of OLDCOMMIT.)

可选的自动化

上面的步骤对于验证和/或修改rebase指令序列很好，但也可以通过以下方式跳过/自动化交互式rebase文本编辑器:

将GIT_SEQUENCE_EDITOR设置为脚本。 创建一个git别名来自动压缩所有排队的修复。 创建一个git别名来自动修复一次提交。

在2023年，有一些工具可以做到这一点:特别是git吸收。它是一个伟大的工具，有潜力改变很多灰尘的git工作流程。

在git 1.7中，有一个非常简单的方法使用git rebase:

整理你的文件:

git add $files

创建一个新的提交并重新使用“坏了”提交的提交消息

git commit -c master~4

预先考虑修正!在主题行(或南瓜!)如果你想编辑commit (message)):

fixup! Factored out some common XPath Operations

使用git rebase -i——autosquash来修复你的提交