{"id":37183,"date":"2023-12-17T05:06:12","date_gmt":"2022-11-24T04:47:46","guid":{"rendered":"https:\/\/www.silicloud.com\/zh\/blog\/%e4%b8%8d%e7%94%a8%e5%ae%b3%e6%80%95%e7%9a%84%e6%92%a4%e9%94%80%e6%93%8d%e4%bd%9c-git-revert-git-reset\/"},"modified":"2024-05-04T13:58:04","modified_gmt":"2024-05-04T05:58:04","slug":"%e4%b8%8d%e7%94%a8%e5%ae%b3%e6%80%95%e7%9a%84%e6%92%a4%e9%94%80%e6%93%8d%e4%bd%9c-git-revert-git-reset","status":"publish","type":"post","link":"https:\/\/www.silicloud.com\/zh\/blog\/%e4%b8%8d%e7%94%a8%e5%ae%b3%e6%80%95%e7%9a%84%e6%92%a4%e9%94%80%e6%93%8d%e4%bd%9c-git-revert-git-reset\/","title":{"rendered":"\u4e0d\u7528\u5bb3\u6015\u7684\u64a4\u9500\u64cd\u4f5c git-revert \/ git-reset"},"content":{"rendered":"

\u9996\u5148<\/h1>\n

\u6709\u65f6\u5019\uff0c\u5728\u4e3b\u5206\u652f\u5408\u5e76\u4e86\u6700\u65b0\u7248\u672c\u4e4b\u540e\uff0c\u53d1\u73b0\u95ee\u9898\u5e76\u5e0c\u671b\u5728\u53d1\u5e03\u4e4b\u524d\u56de\u9000\u3002\u7136\u800c\uff0cgit-revert\/git-reset \u8fd9\u4e9b\u547d\u4ee4\u5e73\u65f6\u4e0d\u5e38\u7528\uff0c\u6240\u4ee5\u53ef\u80fd\u4f1a\u6709\u4e9b\u62b5\u89e6\u60c5\u7eea\u3002\u8fd9\u6b21\u6211\u4eec\u5c06\u901a\u8fc7\u67e5\u770b\u7b80\u5355\u793a\u4f8b\u6765\u4e86\u89e3\u8fd9\u4e9b\u547d\u4ee4\u7684\u4f7f\u7528\u65b9\u6cd5\u3002<\/p>\n

git-revert\/git-reset\u662f\u4ec0\u4e48\uff1f<\/h1>\n

\u4ee5\u4e0b\u662f\u7528\u4e8e\u64a4\u9500\u66f4\u6539\u7684Git\u547d\u4ee4\u3002\u8ba9\u6211\u4eec\u770b\u770b\u5b83\u4eec\u4e4b\u95f4\u7684\u533a\u522b\u3002\u8fd9\u662f\u5b98\u65b9\u6587\u6863\u4e2d\u5199\u7684\u89e3\u91ca\u3002<\/p>\n

revert: \u3044\u304f\u3064\u304b\u306e\u65e2\u5b58\u306e\u30b3\u30df\u30c3\u30c8\u3092\u5143\u306b\u623b\u3057\u307e\u3059<\/p>\n

reset: \u73fe\u5728\u306eHEAD\u3092\u6307\u5b9a\u3055\u308c\u305f\u72b6\u614b\u306b\u30ea\u30bb\u30c3\u30c8\u3057\u307e\u3059
\n\u3060\u305d\u3046\u3067\u3059\u3002<\/p>\n

\"\u30b9\u30af\u30ea\u30fc\u30f3\u30b7\u30e7\u30c3\u30c8<\/div>\n

\u9996\u5148\u56de\u987e git-rebase \/ git-merge\u3002<\/h1>\n

git\u53d8\u57fa<\/h2>\n

\u6309\u7167\u65f6\u95f4\u987a\u5e8f\u9010\u4e2a\u67e5\u770b\u5206\u652f\u8d77\u70b9\u4e4b\u524d\u7684\u63d0\u4ea4\uff0c\u5e76\u9010\u6b65\u5408\u5e76\u81f3\u5206\u652f\u6e90\u3002<\/p>\n

\"\u30b9\u30af\u30ea\u30fc\u30f3\u30b7\u30e7\u30c3\u30c8<\/div>\n

\u5408\u5e76git<\/h2>\n

\u5c06\u5206\u652f\u70b9\u524d\u7684\u5dee\u5f02\u5408\u5e76\u5230\u5206\u652f\u6e90\u3002<\/p>\n

\"\u30b9\u30af\u30ea\u30fc\u30f3\u30b7\u30e7\u30c3\u30c8<\/div>\n

\u52a8\u624b\u5b9e\u8df5<\/h1>\n

\u6211\u4eec\u63a5\u4e0b\u6765 \uff0c\u5728\u67e5\u770b git-revert\/git-reset \u7684\u793a\u4f8b\u65f6 \uff0c\u8fb9\u52a8\u624b\u8fb9\u89c2\u5bdf\u5427\u3002<\/p>\n

git-reset – \u91cd\u7f6eGit<\/h2>\n

\u8bf7\u590d\u5236\u5e76\u8fd0\u884c\u4ee5\u4e0b\u4ee3\u7801\u3002\u8fd0\u884c\u540e\u5c06\u5448\u73b0\u5982\u4e0b\u56fe\u6240\u793a\u7684\u72b6\u6001\u3002<\/p>\n

# msater\u30d6\u30e9\u30f3\u30c1\u3092\u4f5c\u6210<\/span>\r\nmkdir <\/span>gitHandsOn &&<\/span> cd <\/span>gitHandsOn\r\ngit init\r\necho<\/span> \"A\"<\/span> >><\/span> work.txt\r\ngit add .<\/span> &&<\/span> git commit -m<\/span> \"Commit A\"<\/span>\r\n\r\n# feature\u30d6\u30e9\u30f3\u30c1\u306b\u5207\u308a\u66ff\u3048\u3066\u30b3\u30df\u30c3\u30c8A\u304b\u3089\u30b3\u30df\u30c3\u30c8D\u3092\u4f5c\u6210<\/span>\r\ngit checkout -b<\/span> feature\r\necho<\/span> \"B\"<\/span> >><\/span> work.txt\r\ngit add .<\/span> &&<\/span> git commit -m<\/span> \"Commit B\"<\/span>\r\necho<\/span> \"C\"<\/span> >><\/span> work.txt\r\ngit add .<\/span> &&<\/span> git commit -m<\/span> \"Commit C\"<\/span>\r\necho<\/span> \"D\"<\/span> >><\/span> work.txt\r\ngit add .<\/span> &&<\/span> git commit -m<\/span> \"Commit D\"<\/span>\r\n\r\n# git-rebase<\/span>\r\ngit checkout master &&<\/span> git rebase - &&<\/span> git log --oneline<\/span>\r\n<\/code><\/pre>\n
\"\u30b9\u30af\u30ea\u30fc\u30f3\u30b7\u30e7\u30c3\u30c8<\/div>\n
\u63a5\u4e0b\u6765\u8ba9\u6211\u4eec\u5c1d\u8bd5\u8fdb\u884cgit-reset\u3002
\n\u9996\u5148\uff0c\u6211\u4eec\u6765\u5c1d\u8bd5\u64a4\u9500\u4e4b\u524d\u7684\u63d0\u4ea4D\u3002<\/p>\n
git checkout master\r\n# \u30b3\u30df\u30c3\u30c8\u30ed\u30b0\u3092\u8868\u793a<\/span>\r\ngit log --oneline<\/span>\r\n---------------------------------------------------------------<\/span>\r\n8254890 (<\/span>HEAD -> master, feature)<\/span> Commit D\r\n5a5afaf Commit C\r\n09d38a1 Commit B\r\n383454e Commit A\r\n---------------------------------------------------------------<\/span>\r\n# \u30b3\u30df\u30c3\u30c8D\u3092\u6253\u3061\u6d88\u3057\u3066\u307f\u307e\u3057\u3087\u3046<\/span>\r\n# \u307e\u305a\u306f\u4ee5\u4e0b\u306e\u3088\u3046\u306b\u30b3\u30df\u30c3\u30c8D\u306e\u30b3\u30df\u30c3\u30c8\u30ed\u30b0\u3092\u6307\u5b9a\u3057\u3066\u3001git-reset\u3092\u53e9\u3044\u3066\u304f\u3060\u3055\u3044<\/span>\r\ngit reset --hard<\/span> 8254890\r\ngit log --oneline<\/span>\r\n<\/code><\/pre>\n
\u4f60\u89c9\u5f97\u600e\u4e48\u6837\uff0c\u5b83\u6d88\u5931\u4e86\u5417\uff1f<\/p>\n
\u4e0d\u4f1a\u6d88\u5931\u7684\u5462\u3002<\/p>\n
\u8fd9\u662f\u4ec0\u4e48\u610f\u601d\uff1f<\/p>\n
git-reset\u547d\u4ee4\u662f\u5c06HEAD\u79fb\u52a8\u5230\u6307\u5b9a\u63d0\u4ea4\u7684\u547d\u4ee4\uff0c\u6240\u4ee5\u5373\u4f7f\u6307\u5b9a\u4e86\u63d0\u4ea4D\uff0c\u63d0\u4ea4D\u4e5f\u4e0d\u4f1a\u88ab\u53d6\u6d88\u3002<\/p>\n
\u8ba9\u6211\u4eec\u91cd\u65b0\u64a4\u9500D\u63d0\u4ea4\u3002<\/p>\n
git checkout master\r\n# \u30b3\u30df\u30c3\u30c8\u30ed\u30b0\u3092\u8868\u793a<\/span>\r\ngit log --oneline<\/span>\r\n---------------------------------------------------------------<\/span>\r\n8254890 (<\/span>HEAD -> master, feature)<\/span> Commit D\r\n5a5afaf Commit C\r\n09d38a1 Commit B\r\n383454e Commit A\r\n---------------------------------------------------------------<\/span>\r\n# \u30b3\u30df\u30c3\u30c8D\u3092\u6253\u3061\u6d88\u3057\u3066\u307f\u307e\u3057\u3087\u3046<\/span>\r\n# \u6539\u3081\u3066\u4ee5\u4e0b\u306e\u3088\u3046\u306b\u30b3\u30df\u30c3\u30c8D\u306e\u30b3\u30df\u30c3\u30c8\u30ed\u30b0\u3092\u6307\u5b9a\u3057\u3066\u3001git-reset\u3092\u53e9\u3044\u3066\u304f\u3060\u3055\u3044<\/span>\r\ngit reset --hard<\/span> 5a5afaf\r\ngit log --oneline<\/span>\r\n---------------------------------------------------------------<\/span>\r\n5a5afaf (<\/span>HEAD -> master)<\/span> Commit C\r\n09d38a1 Commit B\r\n383454e Commit A\r\n---------------------------------------------------------------<\/span>\r\n<\/code><\/pre>\n
D \u7bc7\u7684\u63d0\u4ea4\u5df2\u6210\u529f\u64a4\u9500\u3002<\/p>\n
\"\u30b9\u30af\u30ea\u30fc\u30f3\u30b7\u30e7\u30c3\u30c8<\/div>\n
\u7ec3\u4e601<\/h2>\n
\u8bf7\u4f7f\u7528\u6700\u521d\u7684\u590d\u5236\u7c98\u8d34\u4ee3\u7801\u5c06\u5176\u8f6c\u6362\u4e3a\u4ee5\u4e0b\u72b6\u6001\u3002
\n\u203b \u6211\u5c06\u7b54\u6848\u653e\u5728\u6700\u540e\u3002<\/p>\n
\"\u30b9\u30af\u30ea\u30fc\u30f3\u30b7\u30e7\u30c3\u30c8<\/div>\n
\u5173\u4e8e”\u786c”\u548c”\u8f6f”\u7684\u533a\u522b<\/h3>\n
\u5f53\u4f7f\u7528hard\u53c2\u6570\u65f6\uff0c\u4f1a\u53d6\u6d88\u63d0\u4ea4\u5e76\u5c06\u672c\u5730\u5185\u5bb9\u56de\u6eda\u5230\u79fb\u52a8\u4e4b\u540e\u7684HEAD\u72b6\u6001\u3002
\n\u5f53\u4f7f\u7528soft\u53c2\u6570\u65f6\uff0c\u63d0\u4ea4\u4f1a\u88ab\u53d6\u6d88\uff0c\u4f46\u672c\u5730\u5185\u5bb9\u5c06\u4fdd\u6301\u4e0d\u53d8\u3002\u8fd9\u9002\u7528\u4e8e\u60f3\u8981\u4fdd\u7559\u4fee\u8ba2\u5185\u5bb9\u4f46\u5220\u9664\u63d0\u4ea4\u7684\u573a\u666f\u3002<\/p>\n
Exercise 2: \u8fd0\u52a8\u4e8c<\/h2>\n
\u8bf7\u4f7f\u7528\u6700\u521d\u590d\u5236\u7c98\u8d34\u7684\u4ee3\u7801\u5c06\u5176\u8f6c\u6362\u4e3a\u4ee5\u4e0b\u72b6\u6001\u3002
\n\u203b \u7b54\u6848\u5c06\u653e\u5728\u6700\u540e\u4e00\u9879\u3002<\/p>\n
\"\u30b9\u30af\u30ea\u30fc\u30f3\u30b7\u30e7\u30c3\u30c8<\/div>\n
\u64a4\u9500git<\/h2>\n
\u8bf7\u590d\u5236\u5e76\u8fd0\u884c\u4ee5\u4e0b\u4ee3\u7801\u3002\u8fd0\u884c\u540e\u5c06\u51fa\u73b0\u5982\u4e0b\u56fe\u6240\u793a\u7684\u72b6\u6001\u3002<\/p>\n
# msater\u30d6\u30e9\u30f3\u30c1\u3092\u4f5c\u6210<\/span>\r\nmkdir <\/span>gitHandsOn &&<\/span> cd <\/span>gitHandsOn\r\ngit init\r\necho<\/span> \"A\"<\/span> >><\/span> work.txt\r\ngit add .<\/span> &&<\/span> git commit -m<\/span> \"Commit A\"<\/span>\r\n\r\n# feature\u30d6\u30e9\u30f3\u30c1\u306b\u5207\u308a\u66ff\u3048\u3066\u30b3\u30df\u30c3\u30c8A\u304b\u3089\u30b3\u30df\u30c3\u30c8D\u3092\u4f5c\u6210<\/span>\r\ngit checkout -b<\/span> feature\r\necho<\/span> \"B\"<\/span> >><\/span> work.txt\r\ngit add .<\/span> &&<\/span> git commit -m<\/span> \"Commit B\"<\/span>\r\necho<\/span> \"C\"<\/span> >><\/span> work.txt\r\ngit add .<\/span> &&<\/span> git commit -m<\/span> \"Commit C\"<\/span>\r\necho<\/span> \"D\"<\/span> >><\/span> work.txt\r\ngit add .<\/span> &&<\/span> git commit -m<\/span> \"Commit D\"<\/span>\r\n\r\n# git-merge<\/span>\r\n# merge\u306e\u969b\u306b\u30b3\u30df\u30c3\u30c8\u30b3\u30e1\u30f3\u30c8\u304c\u5fc5\u8981\u306a\u306e\u3067\u305d\u306e\u307e\u307e\u4fdd\u5b58\u3092\u3057\u3066\u304f\u3060\u3055\u3044<\/span>\r\ngit checkout master &&<\/span> git merge --no-ff<\/span> - &&<\/span> git log --oneline<\/span>\r\n<\/code><\/pre>\n
\"\u30b9\u30af\u30ea\u30fc\u30f3\u30b7\u30e7\u30c3\u30c8<\/div>\n
git checkout master\r\n# \u30b3\u30df\u30c3\u30c8\u30ed\u30b0\u3092\u8868\u793a<\/span>\r\ngit log --oneline<\/span>\r\n---------------------------------------------------------------<\/span>\r\n5b96ca7 (<\/span>HEAD -> master)<\/span> Merge branch 'feature'<\/span>\r\n2757f8e Commit A\r\n914017f (<\/span>feature)<\/span> Commit D\r\n711f950 Commit C\r\nb66b20c Commit B\r\n---------------------------------------------------------------<\/span>\r\n# \u30de\u30fc\u30b8\u30b3\u30df\u30c3\u30c8\u3092\u6307\u5b9a\u3057\u3066revert\u3092\u5b9f\u884c\u3057\u304f\u3066\u3060\u3055\u3044<\/span>\r\ngit revert 5b96ca7\r\n<\/code><\/pre>\n
\u4f60\u600e\u4e48\u6837\uff0c\u5df2\u7ecf\u6d88\u5931\u4e86\u5417\uff1f<\/p>\n
\u4e0d\u4f1a\u6d88\u5931\u554a\u3002<\/p>\n
\u8fd9\u662f\u4ec0\u4e48\u610f\u601d\uff1f<\/p>\n
\u5f53\u4f60\u60f3\u8981\u64a4\u9500\u5408\u5e76\u63d0\u4ea4\u65f6\uff0c\u9700\u8981\u6dfb\u52a0\u4e00\u4e2a\u540d\u4e3a”mainline”\u7684\u9009\u9879\u3002<\/p>\n
\u5f53\u53d6\u6d88\u5408\u5e76\u63d0\u4ea4\u65f6\uff0c\u8bf7\u786e\u4fdd\u5c06mainline\u6307\u5b9a\u4e3a1\u3002<\/p>\n
\u4e3b\u7dda\u6545\u4e8b<\/h3>\n
“mainline”\u662f\u6307Git\u4e2d\u7684\u7236\u7f16\u53f7\u3002”git-merge”\u662f\u5c06\u4e24\u4e2a\u5206\u652f\u5408\u5e76\u7684\u64cd\u4f5c\uff0c\u53ef\u4ee5\u4f7f\u7528\u4ee5\u4e0b\u547d\u4ee4\u6765\u67e5\u627e\u5408\u5e76\u4e86\u54ea\u4e2a\u5206\u652f\u7684\u63d0\u4ea4\u8bb0\u5f55\u3002<\/p>\n
$ <\/span>git show \u30de\u30fc\u30b8\u30b3\u30df\u30c3\u30c8\u306eID\r\ncommit 5b96ca711b150aa66108fead2442699f8203ad9d (<\/span>HEAD -> master)<\/span>\r\nMerge: 2757f8e 914017f\r\nAuthor: takiguchi-yu\r\n\r\n Merge branch 'feature'<\/span>\r\n<\/code><\/pre>\n
\u5728\u8fd9\u91cc\uff0c2757f8e\u88ab\u79f0\u4e3amainline=1\uff0c\u800c914017f\u88ab\u79f0\u4e3amainline=2\u3002<\/p>\n
\u8ba9\u6211\u4eec\u518d\u6b21\u64a4\u9500\u5408\u5e76\u63d0\u4ea4\u3002<\/p>\n
git checkout master\r\n# \u30b3\u30df\u30c3\u30c8\u30ed\u30b0\u3092\u8868\u793a<\/span>\r\ngit log --oneline<\/span>\r\n---------------------------------------------------------------<\/span>\r\n5b96ca7 (<\/span>HEAD -> master)<\/span> Merge branch 'feature'<\/span>\r\n2757f8e Commit A\r\n914017f (<\/span>feature)<\/span> Commit D\r\n711f950 Commit C\r\nb66b20c Commit B\r\n---------------------------------------------------------------<\/span>\r\n# \u30de\u30fc\u30b8\u30b3\u30df\u30c3\u30c8\u3092\u6307\u5b9a\u3057\u3066revert\u3092\u5b9f\u884c\u3057\u304f\u3066\u3060\u3055\u3044<\/span>\r\ngit revert --mainline<\/span> 1 5b96ca7\r\ngit log --oneline<\/span>\r\n---------------------------------------------------------------<\/span>\r\nce3046a (<\/span>HEAD -> master)<\/span> Revert \"Merge branch 'feature'\"<\/span>\r\n5b96ca7 Merge branch 'feature'<\/span>\r\n2757f8e Commit A\r\n914017f (<\/span>feature)<\/span> Commit D\r\n711f950 Commit C\r\nb66b20c Commit B\r\n---------------------------------------------------------------<\/span>\r\n<\/code><\/pre>\n
\u6211\u6210\u529f\u5b8c\u6210\u4e86\u3002\u4e0e\u91cd\u7f6e\u4e0d\u540c\uff0c\u8fd8\u4f1a\u4fdd\u7559\u63d0\u4ea4\u8bb0\u5f55\u3002
\n\u4fdd\u7559\u63d0\u4ea4\u8bb0\u5f55\u80fd\u5e26\u6765\u8bf8\u5982\u53ef\u4ee5\u5728\u56e2\u961f\u5185\u8fdb\u884c\u5ba1\u6838\u7b49\u4f18\u70b9\u3002<\/p>\n
\"\u30b9\u30af\u30ea\u30fc\u30f3\u30b7\u30e7\u30c3\u30c8<\/div>\n
\u7b2c3\u4e2a\u7ec3\u4e60<\/h2>\n
\u8bf7\u4f7f\u7528\u6700\u521d\u7684\u590d\u5236\u7c98\u8d34\u4ee3\u7801\uff0c\u4f7f\u5176\u8fbe\u5230\u4ee5\u4e0b\u72b6\u6001\u3002
\n\u203b\u7b54\u6848\u5c06\u5728\u6700\u540e\u7ed9\u51fa\u3002<\/p>\n
\"\u30b9\u30af\u30ea\u30fc\u30f3\u30b7\u30e7\u30c3\u30c8<\/div>\n
\u6700\u540e<\/h1>\n
\u6709\u65f6\u5019\u5728\u8fdb\u884c\u7ed3\u6784\u6027\u4e1a\u52a1\u65f6\uff0c\u4f1a\u4ea7\u751f\u524d\u8fdb\u7684\u5bf9\u7b56\uff0c\u4f46\u662f\u5982\u679c\u77e5\u9053\u8fd9\u4e9b\u6307\u4ee4\uff0c\u5c31\u80fd\u8f7b\u677e\u5730\u8fdb\u884c\u56de\u9000\uff01<\/p>\n
\u7ec3\u4e60\u7b54\u6848\u6837\u672c<\/h2>\n
\u7ec3\u4e60\u4e00<\/h3>\n
git checkout master\r\ngit log --oneline<\/span>\r\n---------------------------------------------------------------<\/span>\r\n8254890 (<\/span>HEAD -> master, feature)<\/span> Commit D\r\n5a5afaf Commit C\r\n09d38a1 Commit B\r\n383454e Commit A\r\n---------------------------------------------------------------<\/span>\r\n\r\n# git-reset \u306fHEAD\u306e\u79fb\u52d5\u3055\u305b\u308b\u30b3\u30de\u30f3\u30c9\u306a\u306e\u3067\u3001\u30b3\u30df\u30c3\u30c8A\u3092\u6307\u5b9a\u3057\u3066\u3042\u3052\u308c\u3070\u826f\u3044<\/span>\r\ngit reset --hard<\/span> 383454e\r\ngit log --oneline<\/span>\r\n---------------------------------------------------------------<\/span>\r\n383454e (<\/span>HEAD -> master)<\/span> Commit A\r\n---------------------------------------------------------------<\/span>\r\n<\/code><\/pre>\n
\u7ec3\u4e602<\/h3>\n
git checkout master\r\ngit log --oneline<\/span>\r\n---------------------------------------------------------------<\/span>\r\n8254890 (<\/span>HEAD -> master, feature)<\/span> Commit D\r\n5a5afaf Commit C\r\n09d38a1 Commit B\r\n383454e Commit A\r\n---------------------------------------------------------------<\/span>\r\n\r\n# soft\u3067reset\u3059\u308c\u3070\u826f\u3044<\/span>\r\ngit reset --soft<\/span> 383454e\r\ngit log --oneline<\/span>\r\n---------------------------------------------------------------<\/span>\r\n383454e (<\/span>HEAD -> master)<\/span> Commit A\r\n---------------------------------------------------------------<\/span>\r\n<\/code><\/pre>\n
\u7b2c\u4e09\u6b21\u6f14\u7fd2<\/h3>\n
git checkout master\r\ngit log --oneline<\/span>\r\n---------------------------------------------------------------<\/span>\r\n5b96ca7 (<\/span>HEAD -> master)<\/span> Merge branch 'feature'<\/span>\r\n2757f8e Commit A\r\n914017f (<\/span>feature)<\/span> Commit D\r\n711f950 Commit C\r\nb66b20c Commit B\r\n---------------------------------------------------------------<\/span>\r\n\r\n# \u3053\u306e\u5834\u5408\u306f\u666e\u901a\u306b\u30b3\u30df\u30c3\u30c8D\u306e\u30b3\u30df\u30c3\u30c8ID\u3092\u6307\u5b9a\u3057\u3066\u3042\u3052\u308c\u3070\u826f\u3044\u3067\u3059\u306d<\/span>\r\ngit revert 914017f\r\ngit log --oneline<\/span>\r\n---------------------------------------------------------------<\/span>\r\nad37cf4 (<\/span>HEAD -> master)<\/span> Revert \"Commit D\"<\/span>\r\n76572dd Merge branch 'feature'<\/span>\r\n8b4e87e Commit A\r\n3912023 (<\/span>feature)<\/span> Commit D\r\n7454740 Commit C\r\n99f5f37 Commit B\r\n---------------------------------------------------------------<\/span>\r\n<\/code><\/pre>\n","protected":false},"excerpt":{"rendered":"
\u9996\u5148 \u6709\u65f6\u5019\uff0c\u5728\u4e3b\u5206\u652f\u5408\u5e76\u4e86\u6700\u65b0\u7248\u672c\u4e4b\u540e\uff0c\u53d1\u73b0\u95ee\u9898\u5e76\u5e0c\u671b\u5728\u53d1\u5e03\u4e4b\u524d\u56de\u9000\u3002\u7136\u800c\uff0cgit-revert\/git-r […]<\/p>\n","protected":false},"author":7,"featured_media":0,"comment_status":"closed","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"footnotes":""},"categories":[1],"tags":[],"class_list":["post-37183","post","type-post","status-publish","format-standard","hentry","category-uncategorized"],"yoast_head":"\n\u4e0d\u7528\u5bb3\u6015\u7684\u64a4\u9500\u64cd\u4f5c git-revert \/ git-reset - Blog - Silicon Cloud<\/title>\n<meta name=\"robots\" content=\"index, follow, max-snippet:-1, max-image-preview:large, max-video-preview:-1\" \/>\n<link rel=\"canonical\" href=\"https:\/\/www.silicloud.com\/zh\/blog\/\u4e0d\u7528\u5bb3\u6015\u7684\u64a4\u9500\u64cd\u4f5c-git-revert-git-reset\/\" \/>\n<meta property=\"og:locale\" content=\"zh_CN\" \/>\n<meta property=\"og:type\" content=\"article\" \/>\n<meta property=\"og:title\" content=\"\u4e0d\u7528\u5bb3\u6015\u7684\u64a4\u9500\u64cd\u4f5c git-revert \/ git-reset\" \/>\n<meta property=\"og:description\" content=\"\u9996\u5148 \u6709\u65f6\u5019\uff0c\u5728\u4e3b\u5206\u652f\u5408\u5e76\u4e86\u6700\u65b0\u7248\u672c\u4e4b\u540e\uff0c\u53d1\u73b0\u95ee\u9898\u5e76\u5e0c\u671b\u5728\u53d1\u5e03\u4e4b\u524d\u56de\u9000\u3002\u7136\u800c\uff0cgit-revert\/git-r […]\" \/>\n<meta property=\"og:url\" content=\"https:\/\/www.silicloud.com\/zh\/blog\/\u4e0d\u7528\u5bb3\u6015\u7684\u64a4\u9500\u64cd\u4f5c-git-revert-git-reset\/\" \/>\n<meta property=\"og:site_name\" content=\"Blog - Silicon Cloud\" \/>\n<meta property=\"article:published_time\" content=\"2022-11-24T04:47:46+00:00\" \/>\n<meta property=\"article:modified_time\" content=\"2024-05-04T05:58:04+00:00\" \/>\n<meta property=\"og:image\" content=\"https:\/\/cdn.silicloud.com\/blog-img\/blog\/img\/657d2d5c37434c4406c510a9\/5-0.png\" \/>\n<meta name=\"author\" content=\"\u79d1, \u9896\" \/>\n<meta name=\"twitter:card\" content=\"summary_large_image\" \/>\n<meta name=\"twitter:label1\" content=\"\u4f5c\u8005\" \/>\n\t<meta name=\"twitter:data1\" content=\"\u79d1, \u9896\" \/>\n\t<meta name=\"twitter:label2\" content=\"\u9884\u8ba1\u9605\u8bfb\u65f6\u95f4\" \/>\n\t<meta name=\"twitter:data2\" content=\"3 \u5206\" \/>\n<script type=\"application\/ld+json\" class=\"yoast-schema-graph\">{\"@context\":\"https:\/\/schema.org\",\"@graph\":[{\"@type\":\"WebPage\",\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/%e4%b8%8d%e7%94%a8%e5%ae%b3%e6%80%95%e7%9a%84%e6%92%a4%e9%94%80%e6%93%8d%e4%bd%9c-git-revert-git-reset\/\",\"url\":\"https:\/\/www.silicloud.com\/zh\/blog\/%e4%b8%8d%e7%94%a8%e5%ae%b3%e6%80%95%e7%9a%84%e6%92%a4%e9%94%80%e6%93%8d%e4%bd%9c-git-revert-git-reset\/\",\"name\":\"\u4e0d\u7528\u5bb3\u6015\u7684\u64a4\u9500\u64cd\u4f5c git-revert \/ git-reset - Blog - Silicon Cloud\",\"isPartOf\":{\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/#website\"},\"datePublished\":\"2022-11-24T04:47:46+00:00\",\"dateModified\":\"2024-05-04T05:58:04+00:00\",\"author\":{\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/8ca01ba7f7362ad4edb7da206a12f29e\"},\"breadcrumb\":{\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/%e4%b8%8d%e7%94%a8%e5%ae%b3%e6%80%95%e7%9a%84%e6%92%a4%e9%94%80%e6%93%8d%e4%bd%9c-git-revert-git-reset\/#breadcrumb\"},\"inLanguage\":\"zh-Hans\",\"potentialAction\":[{\"@type\":\"ReadAction\",\"target\":[\"https:\/\/www.silicloud.com\/zh\/blog\/%e4%b8%8d%e7%94%a8%e5%ae%b3%e6%80%95%e7%9a%84%e6%92%a4%e9%94%80%e6%93%8d%e4%bd%9c-git-revert-git-reset\/\"]}]},{\"@type\":\"BreadcrumbList\",\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/%e4%b8%8d%e7%94%a8%e5%ae%b3%e6%80%95%e7%9a%84%e6%92%a4%e9%94%80%e6%93%8d%e4%bd%9c-git-revert-git-reset\/#breadcrumb\",\"itemListElement\":[{\"@type\":\"ListItem\",\"position\":1,\"name\":\"\u9996\u9875\",\"item\":\"https:\/\/www.silicloud.com\/zh\/blog\/\"},{\"@type\":\"ListItem\",\"position\":2,\"name\":\"\u4e0d\u7528\u5bb3\u6015\u7684\u64a4\u9500\u64cd\u4f5c git-revert \/ git-reset\"}]},{\"@type\":\"WebSite\",\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/#website\",\"url\":\"https:\/\/www.silicloud.com\/zh\/blog\/\",\"name\":\"Blog - Silicon Cloud\",\"description\":\"\",\"inLanguage\":\"zh-Hans\"},{\"@type\":\"Person\",\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/8ca01ba7f7362ad4edb7da206a12f29e\",\"name\":\"\u79d1, \u9896\",\"image\":{\"@type\":\"ImageObject\",\"inLanguage\":\"zh-Hans\",\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/image\/\",\"url\":\"https:\/\/secure.gravatar.com\/avatar\/8a6fb3cc7ba2f69d2189ba532aec4633ea7ed75ac0af162ec367cb3abc0fb2af?s=96&d=mm&r=g\",\"contentUrl\":\"https:\/\/secure.gravatar.com\/avatar\/8a6fb3cc7ba2f69d2189ba532aec4633ea7ed75ac0af162ec367cb3abc0fb2af?s=96&d=mm&r=g\",\"caption\":\"\u79d1, \u9896\"},\"url\":\"https:\/\/www.silicloud.com\/zh\/blog\/author\/keying\/\"},{\"@type\":\"ImageObject\",\"inLanguage\":\"zh-Hans\",\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/%e4%b8%8d%e7%94%a8%e5%ae%b3%e6%80%95%e7%9a%84%e6%92%a4%e9%94%80%e6%93%8d%e4%bd%9c-git-revert-git-reset\/#local-main-organization-logo\",\"url\":\"\",\"contentUrl\":\"\",\"caption\":\"Blog - Silicon Cloud\"}]}<\/script>\n<!-- \/ Yoast SEO Premium plugin. -->","yoast_head_json":{"title":"\u4e0d\u7528\u5bb3\u6015\u7684\u64a4\u9500\u64cd\u4f5c git-revert \/ git-reset - Blog - Silicon Cloud","robots":{"index":"index","follow":"follow","max-snippet":"max-snippet:-1","max-image-preview":"max-image-preview:large","max-video-preview":"max-video-preview:-1"},"canonical":"https:\/\/www.silicloud.com\/zh\/blog\/\u4e0d\u7528\u5bb3\u6015\u7684\u64a4\u9500\u64cd\u4f5c-git-revert-git-reset\/","og_locale":"zh_CN","og_type":"article","og_title":"\u4e0d\u7528\u5bb3\u6015\u7684\u64a4\u9500\u64cd\u4f5c git-revert \/ git-reset","og_description":"\u9996\u5148 \u6709\u65f6\u5019\uff0c\u5728\u4e3b\u5206\u652f\u5408\u5e76\u4e86\u6700\u65b0\u7248\u672c\u4e4b\u540e\uff0c\u53d1\u73b0\u95ee\u9898\u5e76\u5e0c\u671b\u5728\u53d1\u5e03\u4e4b\u524d\u56de\u9000\u3002\u7136\u800c\uff0cgit-revert\/git-r […]","og_url":"https:\/\/www.silicloud.com\/zh\/blog\/\u4e0d\u7528\u5bb3\u6015\u7684\u64a4\u9500\u64cd\u4f5c-git-revert-git-reset\/","og_site_name":"Blog - Silicon Cloud","article_published_time":"2022-11-24T04:47:46+00:00","article_modified_time":"2024-05-04T05:58:04+00:00","og_image":[{"url":"https:\/\/cdn.silicloud.com\/blog-img\/blog\/img\/657d2d5c37434c4406c510a9\/5-0.png"}],"author":"\u79d1, \u9896","twitter_card":"summary_large_image","twitter_misc":{"\u4f5c\u8005":"\u79d1, \u9896","\u9884\u8ba1\u9605\u8bfb\u65f6\u95f4":"3 \u5206"},"schema":{"@context":"https:\/\/schema.org","@graph":[{"@type":"WebPage","@id":"https:\/\/www.silicloud.com\/zh\/blog\/%e4%b8%8d%e7%94%a8%e5%ae%b3%e6%80%95%e7%9a%84%e6%92%a4%e9%94%80%e6%93%8d%e4%bd%9c-git-revert-git-reset\/","url":"https:\/\/www.silicloud.com\/zh\/blog\/%e4%b8%8d%e7%94%a8%e5%ae%b3%e6%80%95%e7%9a%84%e6%92%a4%e9%94%80%e6%93%8d%e4%bd%9c-git-revert-git-reset\/","name":"\u4e0d\u7528\u5bb3\u6015\u7684\u64a4\u9500\u64cd\u4f5c git-revert \/ git-reset - Blog - Silicon Cloud","isPartOf":{"@id":"https:\/\/www.silicloud.com\/zh\/blog\/#website"},"datePublished":"2022-11-24T04:47:46+00:00","dateModified":"2024-05-04T05:58:04+00:00","author":{"@id":"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/8ca01ba7f7362ad4edb7da206a12f29e"},"breadcrumb":{"@id":"https:\/\/www.silicloud.com\/zh\/blog\/%e4%b8%8d%e7%94%a8%e5%ae%b3%e6%80%95%e7%9a%84%e6%92%a4%e9%94%80%e6%93%8d%e4%bd%9c-git-revert-git-reset\/#breadcrumb"},"inLanguage":"zh-Hans","potentialAction":[{"@type":"ReadAction","target":["https:\/\/www.silicloud.com\/zh\/blog\/%e4%b8%8d%e7%94%a8%e5%ae%b3%e6%80%95%e7%9a%84%e6%92%a4%e9%94%80%e6%93%8d%e4%bd%9c-git-revert-git-reset\/"]}]},{"@type":"BreadcrumbList","@id":"https:\/\/www.silicloud.com\/zh\/blog\/%e4%b8%8d%e7%94%a8%e5%ae%b3%e6%80%95%e7%9a%84%e6%92%a4%e9%94%80%e6%93%8d%e4%bd%9c-git-revert-git-reset\/#breadcrumb","itemListElement":[{"@type":"ListItem","position":1,"name":"\u9996\u9875","item":"https:\/\/www.silicloud.com\/zh\/blog\/"},{"@type":"ListItem","position":2,"name":"\u4e0d\u7528\u5bb3\u6015\u7684\u64a4\u9500\u64cd\u4f5c git-revert \/ git-reset"}]},{"@type":"WebSite","@id":"https:\/\/www.silicloud.com\/zh\/blog\/#website","url":"https:\/\/www.silicloud.com\/zh\/blog\/","name":"Blog - Silicon Cloud","description":"","inLanguage":"zh-Hans"},{"@type":"Person","@id":"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/8ca01ba7f7362ad4edb7da206a12f29e","name":"\u79d1, \u9896","image":{"@type":"ImageObject","inLanguage":"zh-Hans","@id":"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/image\/","url":"https:\/\/secure.gravatar.com\/avatar\/8a6fb3cc7ba2f69d2189ba532aec4633ea7ed75ac0af162ec367cb3abc0fb2af?s=96&d=mm&r=g","contentUrl":"https:\/\/secure.gravatar.com\/avatar\/8a6fb3cc7ba2f69d2189ba532aec4633ea7ed75ac0af162ec367cb3abc0fb2af?s=96&d=mm&r=g","caption":"\u79d1, \u9896"},"url":"https:\/\/www.silicloud.com\/zh\/blog\/author\/keying\/"},{"@type":"ImageObject","inLanguage":"zh-Hans","@id":"https:\/\/www.silicloud.com\/zh\/blog\/%e4%b8%8d%e7%94%a8%e5%ae%b3%e6%80%95%e7%9a%84%e6%92%a4%e9%94%80%e6%93%8d%e4%bd%9c-git-revert-git-reset\/#local-main-organization-logo","url":"","contentUrl":"","caption":"Blog - Silicon Cloud"}]}},"_links":{"self":[{"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/posts\/37183","targetHints":{"allow":["GET"]}}],"collection":[{"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/users\/7"}],"replies":[{"embeddable":true,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/comments?post=37183"}],"version-history":[{"count":2,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/posts\/37183\/revisions"}],"predecessor-version":[{"id":98733,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/posts\/37183\/revisions\/98733"}],"wp:attachment":[{"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/media?parent=37183"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/categories?post=37183"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/tags?post=37183"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}