脚本宝典收集整理的这篇文章主要介绍了git用法集锦,脚本宝典觉得挺不错的,现在分享给大家,也给大家做个参考。
场景1: 修改前一次commit的message信息
# git log commit 16a60240aa5328fe47b23b00bf752b21fe634bca (HEAD -> add-upload-api, origin/add-upload-api) ---第二次commit … commit 60b3e9b90cfb75dfbfcb0f8b82b932ebb56657e5 ---第一次commit,待修改log的commit Author: root <root@lcmaas-wksp-g.novalocal> Date: Thu Nov 11 08:45:30 2021 +0000 ....some message should be correct.... commit f3da70fe98c083781335e61a35a18c52b91392ac (origin/master, origin/HEAD, master) ---第0次commit,基commit
【操作步骤】 1. 重置前两个commit, 将待修改的commit的操作由 "pick" 改成 "edit", 注意这里的顺序和log的是相反的
# git rebase -i HEAD~2 edit 60b3e9b LCMaaS support create CNF package from local disk ---由pick改成edit pick 16a6024 fix style mistakes detected by golint # Rebase f3da70f..16a6024 onto f3da70f (2 commands)保存退出Ctl + O (Write Out) -> 回车Ctl + X (Exit)
2. 修改message
# git commit --amend 保存退出 Ctl + O (Write Out) -> 回车 Ctl + X (Exit)
3. # git rebase --continue Successfully rebased and updated refs/heads/add-upload-api.
4. # git push origin xxx (maybe need -f)
场景2:间隔合并commit, 如下的情况下,想针对第一次commit再增加一些修改:
# git log --oneline be6ce3c my second commit --第二次commit 60b3e9b my first commit --第一次commit f3da70f (origin/master, origin/HEAD, master) Add CONTRIBUTING.md
0. 将当前的修改作为一次新的commit提交
# git add # git commit -m"test"
1. 修改
# git rebase -i HEAD~3 pick 60b3e9b my first commit pick be6ce3c my second commit pick 5d9a124 test 修改顺序, 然后将被合并的commit操作改成"squash", 表示与前一次合并: pick 60b3e9b my first commit squash 5d9a124 test pick be6ce3c my second commit 保存退出 Ctl + O (Write Out) -> 回车 Ctl + X (Exit)
3 # git rebase --continue Successfully rebased and updated refs/heads/add-upload-api. 4. # git push origin xxx (maybe need -f)
以上是脚本宝典为你收集整理的git用法集锦全部内容,希望文章能够帮你解决git用法集锦所遇到的问题。
本图文内容来源于网友网络收集整理提供,作为学习参考使用,版权属于原作者。
如您有任何意见或建议可联系处理。小编QQ:384754419,请注明来意。