Git 删掉某一场递交或MergeGit 删掉有次 commit一、 git reset
git reset ：格式化到有次递交。git reset –soft：本次递交后的修正会被归还到甲类git reset –hard：本次递交后的修正不做任何人留存，git status 查阅组织工作区是没历史记录的。后置预备:
FrankLee@DESKTOP MINGW64 /d/users/Desktop/test2 (master)$ lltotal 4-rw-r–r– 1 FrankLee 197121 6 Nov 3 18:14 a.txt-rw-r–r– 1 FrankLee 197121 3 Nov 3 18:15 b.txt-rw-r–r– 1 FrankLee 197121 2 Nov 3 18:15 c.txt-rw-r–r– 1 FrankLee 197121 2 Nov 3 18:15 d.txtFrankLee@DESKTOP MINGW64 /d/users/Desktop/test2 (master)$ git statusOn branch masternothing to commit, working tree clean
Demo1. 格式化标识符 假如须要删掉的 commit 是新一代的，所以能透过 git reset 指示将标识符格式化到以后有次递交的状况，但很大要将原有的标识符搞好存储，不然格式化后那些发生变动单厢消亡。具体实施如下表所示：
git log // 查阅要格式化的 commit_id “`cpp commit fea033b17af24f44fe2303997d53a5432eedbaf7 (HEAD -> master) Author: Frank Lee Date: Wed Nov 3 18:16:00 2021 +08005commit 6496ef00f556544386c0d518c29645b4aba6b52d merge: 818f852 a061a93 Author: Frank Lee Date: Wed Nov 3 18:15:30 2021 +0800
Merge branch develop
commit 818f852eb63b978491fa5afdccd7aefe4f745a9c Author: Frank Lee Date: Wed Nov 3 18:15:09 2021 +0800
4
commit a061a9334edeef73176e9a846d4e369a5e31bb86 (develop) Author: Frank Lee Date: Wed Nov 3 18:14:35 2021 +0800
2. git reset –hard commit_id // HEAD 就会指向本次的递交历史记录“`shellgit reset –hard 6496ef00f556544386c0d518c29645b4aba6b52d
3.查阅结果:
FrankLee@DESKTOP MINGW64 /d/users/Desktop/test2 (master)$ git logcommit 6496ef00f556544386c0d518c29645b4aba6b52d (HEAD -> master)Merge: 818f852 a061a93Author: Frank LeeDate: Wed Nov 3 18:15:30 2021 +0800Merge branch developcommit 818f852eb63b978491fa5afdccd7aefe4f745a9cAuthor: Frank LeeDate: Wed Nov 3 18:15:09 2021 +08004commit a061a9334edeef73176e9a846d4e369a5e31bb86 (develop)Author: Frank LeeDate: Wed Nov 3 18:14:35 2021 +08003commit 98d66bdf83596672477186d2c9a2135697728fb9Author: Frank LeeDate: Wed Nov 3 18:13:26 2021 +0800
git push origin HEAD –force // 强制推送到远端 git push origin HEAD –forceDemo2. 误删恢复 假如格式化标识符后发现复制错了 commit_id，或者误删了有次 commit 历史记录，也能透过下方标识符恢复：
git reflog // 复制要恢复操作的前面的 hash 值 “` 6496ef0 (HEAD -> master) HEAD@{0}: reset: moving to 6496ef00f556544386c0d518c29645b4aba6b52d fea033b HEAD@{1}: commit: 5 6496ef0 (HEAD -> master) HEAD@{2}: merge develop: Merge made by the ‘recursive’ strategy. 818f852 HEAD@{3}: commit: 4 98d66bd HEAD@{4}: checkout: moving from develop to master a061a93 (develop) HEAD@{5}: commit: 3 7b215fa HEAD@{6}: checkout: moving from master to develop 98d66bd HEAD@{7}: commit: 2 7b215fa HEAD@{8}: commit (initial): 12. git reset –hard hash // 将 hash 换成要恢复的历史历史记录的 hash 值git reset –hard fea033b
1. 注意：删掉中间有次递交时最好不要用 git reset 回退远程库，因为后其他人递交标识符时用 git pull 也会把自己的本地仓库回退到以后的版本，容易出现差错进而增加不必要的组织工作量。#### 二、git rebase- git rebase：当两个分支不在一条线上，须要执行 merge 操作时使用该指示。Demo1. 撤销递交假如中间的有次 commit 须要删掉，可以透过 git rebase 指示实现，方法如下表所示：1. git log // 查找要删掉的前一场递交的 commit_id“`shell$ git logcommit fea033b17af24f44fe2303997d53a5432eedbaf7 (HEAD -> master)Author: Frank LeeDate: Wed Nov 3 18:16:00 2021 +08005commit 6496ef00f556544386c0d518c29645b4aba6b52dMerge: 818f852 a061a93Author: Frank LeeDate: Wed Nov 3 18:15:30 2021 +0800Merge branch developcommit 818f852eb63b978491fa5afdccd7aefe4f745a9cAuthor: Frank LeeDate: Wed Nov 3 18:15:09 2021 +08004commit a061a9334edeef73176e9a846d4e369a5e31bb86 (develop)Author: Frank LeeDate: Wed Nov 3 18:14:35 2021 +08003commit 98d66bdf83596672477186d2c9a2135697728fb9Author: Frank LeeDate: Wed Nov 3 18:13:26 2021 +08002commit 7b215fa6d0b4bbebb245edc31ef2457776d5248aAuthor: Frank LeeDate: Wed Nov 3 18:12:47 2021 +08001
git rebase -i commit_id // 将 commit_id 替换成复制的值git rebase -i 98d66bdf83596672477186d2c9a2135697728fb9pick 818f852 4pick a061a93 3pick fea033b 5# Rebase 98d66bd..fea033b onto 98d66bd (3 commands)# Commands:# p, pick = use commit# r, reword = use commit, but edit the commit message# e, edit = use commit, but stop for amending# s, squash = use commit, but meld into previous commit# f, fixup [-C | -c] = like “squash” but keep only the previous# commits log message, unless -C is used, in which case# keep only this commits message; -c is same as -C but# opens the editor# x, exec = run command (the rest of the line) using shell# b, break = stop here (continue rebase later with git rebase –continue)# d, drop = remove commit# l, label = label current HEAD with a name# t, reset = reset HEAD to a label# m, merge [-C | -c ] [# ]# . create a merge commit using the original merge commits# . message (or the oneline, if no original merge commit was# . specified); use -c to reword the commit message# 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.进入 Vim 编辑模式，将要删掉的 commit 前面的 pick 改成 dropdrop 818f852 4pick a061a93 3pick fea033b 5# Rebase 98d66bd..fea033b onto 98d66bd (3 commands)# Commands:# p, pick = use commit# r, reword = use commit, but edit the commit message# e, edit = use commit, but stop for amending# s, squash = use commit, but meld into previous commit# f, fixup [-C | -c] = like “squash” but keep only the previous# commits log message, unless -C is used, in which case# keep only this commits message; -c is same as -C but# opens the editor# x, exec = run command (the rest of the line) using shell# b, break = stop here (continue rebase later with git rebase –continue)# d, drop = remove commit# l, label = label current HEAD with a name# t, reset = reset HEAD to a label# m, merge [-C | -c ] [# ]# . create a merge commit using the original merge commits# . message (or the oneline, if no original merge commit was# . specified); use -c to reword the commit message# 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.保存并退出 Vim$ git rebase -i 98d66bdf83596672477186d2c9a2135697728fb9Successfully rebased and updated refs/heads/master.$ git logcommit 06b518eaff4afbe9f719c5e0933267cd310c03fc (HEAD -> master)Author: Frank LeeDate: Wed Nov 3 18:16:00 2021 +08005commit 3c0821169f41d74b263aa9ad4bb465a93b734e2dAuthor: Frank LeeDate: Wed Nov 3 18:14:35 2021 +08003commit 98d66bdf83596672477186d2c9a2135697728fb9Author: Frank LeeDate: Wed Nov 3 18:13:26 2021 +08002commit 7b215fa6d0b4bbebb245edc31ef2457776d5248aAuthor: Frank LeeDate: Wed Nov 3 18:12:47 2021 +08001$ git checkout developSwitched to branch developFrankLee@DESKTOP-RQ609Q2 MINGW64 /d/users/Desktop/test2 (develop)$ lltotal 2-rw-r–r– 1 FrankLee 197121 3 Nov 3 19:23 a.txt-rw-r–r– 1 FrankLee 197121 3 Nov 3 19:21 b.txtFrankLee@DESKTOP-RQ609Q2 MINGW64 /d/users/Desktop/test2 (develop)$ git logcommit a061a9334edeef73176e9a846d4e369a5e31bb86 (HEAD -> develop)Author: Frank LeeDate: Wed Nov 3 18:14:35 2021 +08003commit 7b215fa6d0b4bbebb245edc31ef2457776d5248aAuthor: Frank LeeDate: Wed Nov 3 18:12:47 2021 +08001这样就完成了。
解决冲突 该指示执行时极有可能出现 reabase 冲突，能透过以下方法解决：1. git diff // 查阅冲突内容2. // 手动解决冲突（冲突位置已在文件中标明）3. git add 或 git add -A // 添加4. git rebase –continue // 继续 rebase5. // 若还在 rebase 状况，则重复 2、3、4，直至 rebase 完成出现 applying 字样6. git push三、 git revertgit revert：放弃有次递交。 git revert 以后的递交仍会留存在 git log 中，而本次撤销会做为一场新的递交。git revert -m：用于对 merge 节点的操作，-m 指定具体某个递交点。Demo1. 撤销递交 要撤销中间有次递交时，使用 git revert 也是一个很好的选择：
git log // 查找须要撤销的 commit_id$ git logcommit fea033b17af24f44fe2303997d53a5432eedbaf7 (HEAD -> master)Author: Frank LeeDate: Wed Nov 3 18:16:00 2021 +08005commit 6496ef00f556544386c0d518c29645b4aba6b52dMerge: 818f852 a061a93Author: Frank LeeDate: Wed Nov 3 18:15:30 2021 +0800Merge branch developcommit 818f852eb63b978491fa5afdccd7aefe4f745a9cAuthor: Frank LeeDate: Wed Nov 3 18:15:09 2021 +08004commit a061a9334edeef73176e9a846d4e369a5e31bb86 (develop)Author: Frank LeeDate: Wed Nov 3 18:14:35 2021 +0800git revert commit_id // 撤销这次递交$ git revert 818f852eb63b978491fa5afdccd7aefe4f745a9cRemoving c.txt[master 32ee39e] Revert “4”1 file changed, 1 deletion(-)delete mode 100644 c.txt$ git logcommit 32ee39e4d571b11f421ec114a7e884b8369df97b (HEAD -> master)Author: Frank LeeDate: Wed Nov 3 19:04:30 2021 +0800Revert “4”This reverts commit 818f852eb63b978491fa5afdccd7aefe4f745a9c.commit fea033b17af24f44fe2303997d53a5432eedbaf7Author: Frank LeeDate: Wed Nov 3 18:16:00 2021 +08005commit 6496ef00f556544386c0d518c29645b4aba6b52dMerge: 818f852 a061a93Author: Frank LeeDate: Wed Nov 3 18:15:30 2021 +0800Merge branch developcommit 818f852eb63b978491fa5afdccd7aefe4f745a9cAuthor: Frank LeeDate: Wed Nov 3 18:15:09 2021 +08004commit a061a9334edeef73176e9a846d4e369a5e31bb86 (develop)Author: Frank LeeDate: Wed Nov 3 18:14:35 2021 +08003commit 98d66bdf83596672477186d2c9a2135697728fb9Author: Frank LeeDate: Wed Nov 3 18:13:26 2021 +08002commit 7b215fa6d0b4bbebb245edc31ef2457776d5248aAuthor: Frank LeeDate: Wed Nov 3 18:12:47 2021 +08001Demo2. 撤销 merge 节点递交 假如这次递交是 merge 节点的话，则须要加上 -m 指令：
git revert commit_id -m 1 // 第一个递交点$ git revert 6496ef00f556544386c0d518c29645b4aba6b52d -m 1Removing b.txt[master fce4cf4] Revert “Merge branch develop”1 file changed, 1 deletion(-)delete mode 100644 b.txt$ git reflogfce4cf4 (HEAD -> master) HEAD@{0}: revert: Revert “Merge branch develop”fea033b HEAD@{1}: commit: 56496ef0 HEAD@{2}: merge develop: Merge made by the recursive strategy.818f852 HEAD@{3}: commit: 498d66bd HEAD@{4}: checkout: moving from develop to mastera061a93 (develop) HEAD@{5}: commit: 37b215fa HEAD@{6}: checkout: moving from master to develop98d66bd HEAD@{7}: commit: 27b215fa HEAD@{8}: commit (initial): 12. // 假如有冲突,手动解决冲突3. git add -A4. git commit -m “”5. git revert commit_id -m 2 // 第二个递交点6. // 重复 2，3，47. git push
