# 撤銷前一次 commit
git revert head
# 撤銷前前一次 commit
git revert head^
# 撤回指定commit-id
#比如：git revert 0818badf6882ea2664a205bc8ef3a85425bb2537
git revert commit-id
revert是撤回指定版本的內容並提交乙個新的commit，不影響之前提交的內容建立a.txt 內容為aaaa。然後新增到git
git add .
git commit -m "a.txt"
git add .
git commit -m "a.txt add bbbb"
aaaa
bbbb
git log
---commit 329515ee5d367bda3effa3e8f0c958e98e93ce31
author: *****
date: tue mar 6 19:25:39 2018 +0800
a.txt add bbbb
commit fe0d9b1d7ed0176f542a52835b1923584a4ba060
author: *****
date: tue mar 6 19:24:34 2018 +0800
a.txt
git revert 329515aaaagit log
---commit 23880e1f7649b7dca14cfda7553b2ff2e6088d6e
author: *****
date: tue mar 6 19:29:35 2018 +0800
revert "a.txt add bbbb"
this reverts commit 329515ee5d367bda3effa3e8f0c958e98e93ce31.
commit 329515ee5d367bda3effa3e8f0c958e98e93ce31
author: *****
date: tue mar 6 19:25:39 2018 +0800
a.txt add bbbb
commit fe0d9b1d7ed0176f542a52835b1923584a4ba060
author: *****
date: tue mar 6 19:24:34 2018 +0800
a.txt
如果撤回到之前版本出現衝突怎麼辦？我們先回到329515版本
git reset --hard 329515此時a.txt檔案內容為：
aaaa
bbbb
cccc
git log
---commit f1258438d3b63e78bb747c510f9af3e56be5b3b0
author: *****
date: tue mar 6 19:39:20 2018 +0800
a.txt add cccc
commit 329515ee5d367bda3effa3e8f0c958e98e93ce31
author: *****
date: tue mar 6 19:25:39 2018 +0800
a.txt add bbbb
commit fe0d9b1d7ed0176f542a52835b1923584a4ba060
author: *****
date: tue mar 6 19:24:34 2018 +0800
a.txt
git revert 329515git revert --continuecommit 78979e45add34a0f009263e49cc1c6c48a0f93d4
author: *****
date: tue mar 6 19:46:40 2018 +0800
revert "a.txt add bbbb"
this reverts commit 329515ee5d367bda3effa3e8f0c958e98e93ce31.
commit f1258438d3b63e78bb747c510f9af3e56be5b3b0
author: *****
date: tue mar 6 19:39:20 2018 +0800
a.txt add cccc
commit 329515ee5d367bda3effa3e8f0c958e98e93ce31
author: *****
date: tue mar 6 19:25:39 2018 +0800
a.txt add bbbb
commit fe0d9b1d7ed0176f542a52835b1923584a4ba060
author: *****
date: tue mar 6 19:24:34 2018 +0800
a.txt
git revert --abortgit revert和git reset的區別
原文 git revert 是生成乙個新的提交來撤銷某次提交，此次提交之前的commit都會被保留 git reset 是回到某次提交，提交及之前的commit都會被保留，但是此次之後的修改都會被退回到暫存區 具體乙個例子，假設有三個commit，git st commit3 add test3.c...
git revert和git reset的區別
git revert 是撤銷某次操作，此次操作之前的commit都會被保留 git reset 是撤銷某次提交，但是此次之後的修改都會被退回到暫存區 具體乙個例子，假設有三個commit，git st commit3 add test3.c commit2 add test2.c commit1 a...
git revert和git reset的區別
git revert 是撤銷某次操作，此次操作之前的commit都會被保留 git reset 是撤銷某次提交，但是此次之後的修改都會被退回到暫存區 具體乙個例子，假設有三個commit，git st commit3 add test3.c commit2 add test2.c commit1 a...