github:已经提交并push后再次追加提交

快速链接: .

(1)修改倒数第1次的commit

指令：$ git rebase -i HEAD~1

(2)修改pick为edit

// 这里修改代码、以及git add

(3)$ git commit --amend

按i进入编辑模式，修改内容，退出编辑模式，输入:wq保存并退出

(4)$ git rebase --continue

(5)强制push $ git push --force github

例如:

test@test-21:~/workspace/optee/my_opteeos/optee_os$ git rebase -i HEAD~1
Stopped at 615c14d4...  scripts : check the input already signed before signing a TA
You can amend the commit now, with

  git commit --amend 

Once you are satisfied with your changes, run

  git rebase --continue


test@test-21:~/workspace/optee/my_opteeos/optee_os$ git add scripts/sign_encrypt.py
test@test-21:~/workspace/optee/my_opteeos/optee_os$ git commit --amend
[detached HEAD cd49d655] scripts : Check the input already signed before signing a TA
 Date: Mon Jan 25 23:06:04 2021 +0800
 1 file changed, 11 insertions(+)


test@test-21:~/workspace/optee/my_opteeos/optee_os$ git push --force https://github.com/baronZhou/optee_os.git
Username for https://github.com: baronZhou
Password for https://baronZhou@github.com: 
Enumerating objects: 7, done.
Counting objects: 100% (7/7), done.
Compressing objects: 100% (4/4), done.
Writing objects: 100% (4/4), 897 bytes | 149.00 KiB/s, done.
Total 4 (delta 3), reused 0 (delta 0), pack-reused 0
remote: Resolving deltas: 100% (3/3), completed with 3 local objects.
To https://github.com/baronZhou/optee_os.git
 + 615c14d4...cd49d655 master -> master (forced update)