git 更新历史提交

# 使用git log 查看历史提交，得到需要修改的那次提交的commit id
git log
# 执行rebase命令，注意<commit-id>后面有一个^，表示修改在此次提交前
git rebase -i '<commmit-hash>^' # 如果是修改第一次提交，使用 git rebase -i --root
# 修改代码
vim changed-file
# git add 添加更新后的文件
git add changed-file
# git commit 提交，注意需要使用后面三个选项，并且不需要加commit信息，因为会采用之前的commit信息
git commit --all --amend --no-edit
# 使用--continue来完成 git rebase
git rebase --continue

mkdir my_project && cd my_project
git init
echo "This is my meth library" >> README.md
git add README.md
git commit -m "doc: add readme"
echo "import numpy as np" >> main.py
git add main.py
git commit -m "feat: create main.py"

$ git log

* 9bec788 - (HEAD -> main) add sigmoid (31 minutes ago) <xyz>
* ea833e9 - doc: add doc (31 minutes ago) <xyz>

$ git rebase -i --root
Successfully rebased and updated refs/heads/main.

pick ea833e9 doc: add doc
pick 9bec788 add sigmoid

# Rebase 9bec788 onto 927493a (2 commands)
#
# Commands:
# p, pick <commit> = use commit
# r, reword <commit> = use commit, but edit the commit message
# e, edit <commit> = use commit, but stop for amending
# s, squash <commit> = use commit, but meld into previous commit
# f, fixup [-C | -c] <commit> = like "squash" but keep only the previous
#                    commit's log message, unless -C is used, in which case
#                    keep only this commit's message; -c is same as -C but
#                    opens the editor
# x, exec <command> = run command (the rest of the line) using shell
# b, break = stop here (continue rebase later with 'git rebase --continue')
# d, drop <commit> = remove commit
# l, label <label> = label current HEAD with a name
# t, reset <label> = reset HEAD to a label
# m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]
#         create a merge commit using the original merge commit's
#         message (or the oneline, if no original merge commit was
#         specified); use -c <commit> to reword the commit message
# u, update-ref <ref> = track a placeholder for the <ref> to be updated
#                       to this position in the new commits. The <ref> is
#                       updated at the end of the rebase
#
# These lines can be re-ordered; they are executed from top to bottom.

edit ea833e9 doc: add doc
pick 9bec788 add sigmoid

# Rebase 9bec788 onto e3f4cea (2 commands)
#
# Commands:
# p, pick <commit> = use commit
# r, reword <commit> = use commit, but edit the commit message
# e, edit <commit> = use commit, but stop for amending
# s, squash <commit> = use commit, but meld into previous commit
# f, fixup [-C | -c] <commit> = like "squash" but keep only the previous
#                    commit's log message, unless -C is used, in which case
#                    keep only this commit's message; -c is same as -C but
#                    opens the editor
# x, exec <command> = run command (the rest of the line) using shell
# b, break = stop here (continue rebase later with 'git rebase --continue')
# d, drop <commit> = remove commit
# l, label <label> = label current HEAD with a name
# t, reset <label> = reset HEAD to a label
# m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]
#         create a merge commit using the original merge commit's
#         message (or the oneline, if no original merge commit was
#         specified); use -c <commit> to reword the commit message
# u, update-ref <ref> = track a placeholder for the <ref> to be updated
#                       to this position in the new commits. The <ref> is
#                       updated at the end of the rebase
#
# These lines can be re-ordered; they are executed from top to bottom.
#
# If you remove a line here THAT COMMIT WILL BE LOST.
#
# However, if you remove everything, the rebase will be aborted.

Stopped at ea833e9...  doc: add doc
You can amend the commit now, with

  git commit --amend

Once you are satisfied with your changes, run

  git rebase --continue

interactive rebase in progress; onto e3f4cea
Last command done (1 command done):
   edit ea833e9 doc: add doc
Next command to do (1 remaining command):
   pick 9bec788 add sigmoid
  (use "git rebase --edit-todo" to view and edit)
You are currently editing a commit while rebasing branch 'main' on 'e3f4cea'.
  (use "git commit --amend" to amend the current commit)
  (use "git rebase --continue" once you are satisfied with your changes)

nothing to commit, working tree clean

$ git add README.md

$ git commit --all --amend --no-edit
[detached HEAD 3b83a85] doc: add doc
 Date: Sat Dec 17 18:00:12 2022 +0800
 1 file changed, 3 insertions(+)
 create mode 100644 README.md

$ git rebase --continue
Successfully rebased and updated refs/heads/main.