{"id":16269,"date":"2024-09-05T15:40:56","date_gmt":"2024-09-05T07:40:56","guid":{"rendered":"https:\/\/92it.top\/?p=16269"},"modified":"2024-09-05T15:40:56","modified_gmt":"2024-09-05T07:40:56","slug":"git-%e9%80%86%e8%bd%ac%e6%97%b6%e5%85%89%ef%bc%9a%e7%89%88%e6%9c%ac%e5%9b%9e%e9%80%80%e6%93%8d%e4%bd%9c%e8%af%a6%e8%a7%a3","status":"publish","type":"post","link":"https:\/\/92it.top\/?p=16269","title":{"rendered":"Git \u9006\u8f6c\u65f6\u5149\uff1a\u7248\u672c\u56de\u9000\u64cd\u4f5c\u8be6\u89e3"},"content":{"rendered":"\n<p><strong>1.Git\u7684\u5de5\u4f5c\u6d41\u7a0b<\/strong><\/p>\n\n\n\n<hr class=\"wp-block-separator has-alpha-channel-opacity\"\/>\n\n\n\n<p>\u5728\u8bb2\u8fd9\u4e2a\u7248\u672c\u56de\u9000\u4e4b\u524d\uff0c\u6211\u4eec\u8981\u6e29\u4e60\u4e00\u4e0b<code>Git<\/code>\u7684\u539f\u7406\u3002\u4e0b\u9762\u8fd9\u5f20\u56fe\u5c31\u662f\u00a0<code>Git<\/code>\u00a0\u7684\u6574\u4e2a\u5de5\u4f5c\u6d41\u7a0b\uff0c\u4e5f\u662f\u00a0<code>Git<\/code>\u00a0\u62bd\u8c61\u51fa\u6765\u7684\u51e0\u4e2a\u6982\u5ff5\u3002<br><br>Git \u7684\u56db\u4e2a\u533a\u57df\uff1a<\/p>\n\n\n\n<ul>\n<li><code>workspace<\/code>\uff1a\u672c\u5730\u5de5\u4f5c\u533a\uff0c\u5c31\u662f\u4f60\u5e73\u65f6\u5b58\u653e\u9879\u76ee\u4ee3\u7801\u7684\u5730\u65b9\u3002\u6bd4\u5982\u4f60\u62c9\u53d6\u4ee3\u7801<code>git clone ssh:\/\/fly@192.168.31.91:\/home\/fly\/srcs<\/code>\uff0c<code>srcs<\/code>\u76ee\u5f55\u5c31\u662f\u672c\u5730\u5de5\u4f5c\u533a\u4e86\u3002\u5f00\u53d1\u8005\u5c31\u5728\u5de5\u4f5c\u533a\u91cc\u5199\u4ee3\u7801\u3002<\/li>\n\n\n\n<li><code>Index \/ Stage<\/code>\uff1a\u6682\u5b58\u533a\uff0c\u7528\u4e8e\u4e34\u65f6\u5b58\u653e\u4f60\u7684\u6539\u52a8\uff0c\u4e8b\u5b9e\u4e0a\u5b83\u53ea\u662f\u4e00\u4e2a\u6587\u4ef6\uff0c\u4fdd\u5b58\u5373\u5c06\u63d0\u4ea4\u5230\u6587\u4ef6\u5217\u8868\u4fe1\u606f\u3002\u503c\u5f97\u4e00\u63d0\u7684\u662f\uff0cSVN \u662f\u6ca1\u6709\u6682\u5b58\u533a\u6982\u5ff5\u7684\u3002\u6682\u5b58\u533a\u5141\u8bb8\u628a\u591a\u6b21\u4fee\u6539\u7edf\u4e00\u653e\u5728\u6682\u5b58\u533a\u4e2d\uff0c\u7136\u540e\u518d\u7531\u6682\u5b58\u533a\u7edf\u4e00\u63d0\u4ea4\u5230\u672c\u5730\u4ed3\u5e93\uff0c\u786e\u4fdd\u63d0\u4ea4\u8bb0\u5f55\u6e05\u6670\u3002<\/li>\n\n\n\n<li><code>Repository<\/code>\uff1a\u672c\u5730\u4ed3\u5e93\u533a\uff08\u6216\u7248\u672c\u5e93\uff09\uff0c\u5c31\u662f\u5b89\u5168\u5b58\u653e\u6570\u636e\u7684\u4f4d\u7f6e\uff0c\u8fd9\u91cc\u9762\u6709\u4f60\u63d0\u4ea4\u5230\u6240\u6709\u7248\u672c\u7684\u6570\u636e\u3002\u5176\u4e2dHEAD\u6307\u5411\u6700\u65b0\u653e\u5165\u4ed3\u5e93\u7684\u7248\u672c\u3002<\/li>\n\n\n\n<li><code>Remote<\/code>\uff1a\u8fdc\u7a0b\u4ed3\u5e93\uff0c\u6258\u7ba1\u4ee3\u7801\u7684\u670d\u52a1\u5668\uff0c\u53ef\u4ee5\u7b80\u5355\u7684\u8ba4\u4e3a\u662f\u4f60\u9879\u76ee\u7ec4\u4e2d\u7684\u4e00\u53f0\u7535\u8111\u7528\u4e8e\u8fdc\u7a0b\u6570\u636e\u4ea4\u6362\u3002<\/li>\n<\/ul>\n\n\n\n<p>Git \u7684 \u5de5\u4f5c\u6d41\u7a0b \u4e00\u822c\u662f\u8fd9\u6837\u7684\uff1a<\/p>\n\n\n<div class=\"wp-block-image\">\n<figure class=\"aligncenter size-large is-resized\"><img loading=\"lazy\" decoding=\"async\" width=\"1024\" height=\"238\" src=\"https:\/\/92it.top\/wp-content\/uploads\/2024\/09\/\u56fe\u7247-50-1024x238.png\" alt=\"\" class=\"wp-image-16270\" style=\"width:536px;height:auto\" srcset=\"https:\/\/92it.top\/wp-content\/uploads\/2024\/09\/\u56fe\u7247-50-1024x238.png 1024w, https:\/\/92it.top\/wp-content\/uploads\/2024\/09\/\u56fe\u7247-50-300x70.png 300w, https:\/\/92it.top\/wp-content\/uploads\/2024\/09\/\u56fe\u7247-50-768x178.png 768w, https:\/\/92it.top\/wp-content\/uploads\/2024\/09\/\u56fe\u7247-50-830x193.png 830w, https:\/\/92it.top\/wp-content\/uploads\/2024\/09\/\u56fe\u7247-50-230x53.png 230w, https:\/\/92it.top\/wp-content\/uploads\/2024\/09\/\u56fe\u7247-50-350x81.png 350w, https:\/\/92it.top\/wp-content\/uploads\/2024\/09\/\u56fe\u7247-50-480x111.png 480w, https:\/\/92it.top\/wp-content\/uploads\/2024\/09\/\u56fe\u7247-50.png 1370w\" sizes=\"(max-width: 1024px) 100vw, 1024px\" \/><\/figure><\/div>\n\n\n<ol>\n<li>\u5728\u5de5\u4f5c\u533a\u76ee\u5f55\u4e2d\u6dfb\u52a0\u3001\u4fee\u6539\u6587\u4ef6\uff1b\u4ea7\u751f\u6570\u636e\u53d8\u66f4\u3002<\/li>\n\n\n\n<li>\u5c06\u9700\u8981\u8fdb\u884c\u7248\u672c\u7ba1\u7406\u7684\u6587\u4ef6<code>add<\/code>\u5230\u6682\u5b58\u533a\u57df\uff1b<\/li>\n\n\n\n<li>\u5c06\u6682\u5b58\u533a\u57df\u7684\u6587\u4ef6<code>commit<\/code>\u5230<code>git<\/code>\u4ed3\u5e93\uff1b<\/li>\n\n\n\n<li>\u672c\u5730\u7684\u4fee\u6539<code>push<\/code>\u5230\u8fdc\u7a0b\u4ed3\u5e93\uff0c\u5982\u679c\u5931\u8d25\u5219\u6267\u884c\u7b2c5\u6b65\uff1b<\/li>\n\n\n\n<li><code>git pull<\/code>\u5c06\u8fdc\u7a0b\u4ed3\u5e93\u7684\u4fee\u6539\u62c9\u53d6\u5230\u672c\u5730\uff0c\u5982\u679c\u6709\u51b2\u7a81\u9700\u8981\u4fee\u6539\u51b2\u7a81\uff0c\u56de\u5230\u7b2c\u4e09\u6b65\u3002<\/li>\n<\/ol>\n\n\n\n<p>\u56e0\u6b64\uff0cgit\u7ba1\u7406\u7684\u6587\u4ef6\u81f3\u5c11\u6709\u4e09\u79cd\u72b6\u6001\uff1a\u5df2\u4fee\u6539\uff08modified\uff09\u3001\u5df2\u6682\u5b58\uff08staged\uff09\u3001\u5df2\u63d0\u4ea4(committed)\u3002<\/p>\n\n\n\n<p><strong>2.\u56de\u9000 \u5c1a\u672a commit \u7684\u4fee\u6539<\/strong><\/p>\n\n\n\n<hr class=\"wp-block-separator has-alpha-channel-opacity\"\/>\n\n\n\n<p>\u672c\u5730\u505a\u4e86\u4e00\u4e9b\u4fee\u6539\uff0c\u5305\u62ec\u4fee\u6539\u4e86\u67d0\u4e9b\u6587\u4ef6\uff0c\u589e\u52a0\u4e86\u67d0\u4e9b\u6587\u4ef6\uff0c\u5220\u9664\u4e86\u4e00\u4e9b\u76ee\u5f55\uff0c\u4e5f\u6dfb\u52a0\u4e86\u4e00\u4e9b\u76ee\u5f55\uff0c\u6709\u4e9b\u5185\u5bb9\u6dfb\u52a0\u5230\u4e86\u6682\u5b58\u533a\uff0c\u6709\u4e9b\u6ca1\u6709\u3002\u60c5\u51b5\u5f88\u590d\u6742\uff0c\u4f46\u662f\u3001\u603b\u4e4b\uff0c\u8fd9\u4e9b\u4fee\u6539\u6ca1\u6709<code>commit<\/code>\u5230\u672c\u5730\u4ed3\u5e93\uff0c\u90a3\u6b64\u65f6\u6211\u4eec\u8bf4\u7684\u7248\u672c\u56de\u9000\u5c31\u662f\u6307<strong>\u4e22\u5f03\u4fee\u6539<\/strong>\u3002\u90a3\u5982\u4f55\u64cd\u4f5c\u5462\uff1f<\/p>\n\n\n\n<p>\u4ece\u539f\u7406\u56fe\u4e2d\uff0c\u770b\u5230<code>git checkout<\/code>\u547d\u4ee4\u5c31\u662f\u4ece\u672c\u5730\u4ed3\u5e93\u4e2d\u6216\u6682\u5b58\u533a\u68c0\u51fa\u6587\u4ef6\uff0c\u5e76\u4e14\u8986\u76d6\u5de5\u4f5c\u76ee\u5f55\u7684\u5185\u5bb9\u3002\u6bd4\u5982\uff1a<\/p>\n\n\n\n<pre class=\"EnlighterJSRAW\" data-enlighter-language=\"generic\" data-enlighter-theme=\"\" data-enlighter-highlight=\"\" data-enlighter-linenumbers=\"\" data-enlighter-lineoffset=\"\" data-enlighter-title=\"\" data-enlighter-group=\"\"># \u68c0\u51fa\u5230branches\/stable-1.14\u5206\u652f\u4e0a\uff0c\u5373\u75281.14\u5206\u652f\u7684\u5185\u5bb9\u8986\u76d6\u4e86\u5de5\u4f5c\u533a\u6240\u6709\u5185\u5bb9\ngit checkout branches\/stable-1.14  \n\n# \u68c0\u51fa\u52309bfbacdd\uff08commit id\uff09\u4e0a\uff0c\u5373\u7528\u8fd9\u4e2acommit \u5185\u5bb9\u8986\u76d6\u4e86\u5de5\u4f5c\u533a\u6240\u6709\u5185\u5bb9\ngit checkout 9bfbacdd  \n\n# \u4ece\u6682\u5b58\u533a\u4e2d\u68c0\u51fa\u5185\u5bb9\uff0c\u5e76\u4e14\u8986\u76d6main.cpp\u6587\u4ef6\u5185\u5bb9\uff0c\u5373\u5c1a\u672a\u6dfb\u52a0\u5230\u6682\u5b58\u533a\u7684\u4fee\u6539\u4f1a\u88ab\u4e22\u5f03\u6389\ngit checkout main.cpp<\/pre>\n\n\n\n<p>\u53ef\u662f\u4e0a\u9762\u90fd\u662f\u8bf4\u4ece<code>git<\/code>\u7684\u672c\u5730\u4ed3\u5e93\u548c\u6682\u5b58\u533a\u91cc\u68c0\u51fa\u5185\u5bb9\uff0c\u7136\u540e\u8986\u76d6\u6389\u5de5\u4f5c\u533a\u7684\u5185\u5bb9\uff0c\u5373\u4e22\u5f03\u4e86\u672c\u5730\u6240\u6709\u7684\u4fee\u6539\u3002<\/p>\n\n\n\n<p>\u90a3\u5982\u679c\u662f\u6709\u4e9b\u5185\u5bb9\u5df2\u7ecf\u5b58\u5728\u5de5\u4f5c\u533a\u4e86\uff0c\u4f46\u662f\u5c1a\u672a\u63d0\u4ea4\u5230\u6682\u5b58\u533a\uff0c\u5373\u662f<code>untracked<\/code>\u7684\u5185\u5bb9\uff0c\u90a3\u4e48\u6211\u4eec\u53ef\u4ee5\u4f7f\u7528<code>git clean<\/code>\u547d\u4ee4\u6765\u5220\u9664\u8fd9\u4e9b\u6587\u4ef6\uff0c\u7528\u6cd5\u5982\u4e0b\uff1a<\/p>\n\n\n\n<ul>\n<li><code>git clean -n<\/code>\u00a0\uff1a\u662f\u4e00\u6b21<code>clean<\/code>\u7684\u6f14\u4e60\uff0c\u544a\u8bc9\u4f60\u54ea\u4e9b\u6587\u4ef6\u4f1a\u88ab\u5220\u9664\uff0c\u8bb0\u4f4f\u4ed6\u4e0d\u4f1a\u771f\u6b63\u7684\u5220\u9664\u6587\u4ef6\uff0c\u53ea\u662f\u4e00\u4e2a\u63d0\u9192\u3002<\/li>\n\n\n\n<li><code>git clean -f<\/code>\u00a0\uff1a\u5220\u9664\u5f53\u524d\u76ee\u5f55\u4e0b\u6240\u6709\u6ca1\u6709<code>track<\/code>\u8fc7\u7684\u6587\u4ef6\uff0c\u4ed6\u4e0d\u4f1a\u5220\u9664<code>.gitignore<\/code>\u6587\u4ef6\u91cc\u9762\u6307\u5b9a\u7684\u6587\u4ef6\u5939\u548c\u6587\u4ef6\uff0c\u4e0d\u7ba1\u8fd9\u4e9b\u6587\u4ef6\u6709\u6ca1\u6709\u88ab<code>track<\/code>\u8fc7\u3002<\/li>\n\n\n\n<li><code>git clean -f &lt;path><\/code>\u00a0\uff1a\u5220\u9664\u6307\u5b9a\u8def\u5f84\u4e0b\u7684\u6ca1\u6709\u88ab<code>track<\/code>\u8fc7\u7684\u6587\u4ef6\u3002<\/li>\n\n\n\n<li><code>git clean -df<\/code>\u00a0\uff1a\u5220\u9664\u5f53\u524d\u76ee\u5f55\u4e0b\u6ca1\u6709\u88ab<code>track<\/code>\u8fc7\u7684\u6587\u4ef6\u548c\u6587\u4ef6\u5939\u3002<\/li>\n\n\n\n<li><code>git clean -xf<\/code>\u00a0\uff1a\u5220\u9664\u5f53\u524d\u76ee\u5f55\u4e0b\u6240\u6709\u6ca1\u6709<code>track<\/code>\u8fc7\u7684\u6587\u4ef6\uff0c\u4e0d\u7ba1\u4ed6\u662f\u5426\u662f<code>.gitignore<\/code>\u6587\u4ef6\u91cc\u9762\u6307\u5b9a\u7684\u6587\u4ef6\u5939\u548c\u6587\u4ef6\u3002<\/li>\n<\/ul>\n\n\n\n<p>\u597d\u4e86\uff0c\u5982\u679c\u6211\u4eec\u60f3\u8981\u653e\u5f03\u672c\u5730\u7684\u6240\u6709\u4fee\u6539\u53ef\u4ee5\uff1a<\/p>\n\n\n\n<ul>\n<li><code>git checkout .<\/code>\uff1a\u6ce8\u610f\u6709\u4e00\u4e2a\u201c<code>.<\/code>\u201d\uff0c\u4f1a\u4ece\u6682\u5b58\u533a\u91cc\u53d6\u51fa\u6240\u6709\u5185\u5bb9\u8986\u76d6\u6389\u5de5\u4f5c\u533a\u7684\u6240\u6709\u4fee\u6539\uff0c\u5982\u679c\u8fde\u6682\u5b58\u533a\u7684\u5185\u5bb9\u4e5f\u4e0d\u60f3\u8981\u5219\u53ef\u4ee5<code>git checkout commit-id<\/code>\u3002<\/li>\n\n\n\n<li><code>git clean -xdf<\/code>\uff1a\u5220\u9664\u5f53\u524d\u76ee\u5f55\u4e0b\u6240\u6709\u7684\u4fee\u6539\u3002<\/li>\n<\/ul>\n\n\n\n<p>\u5982\u679c\u6211\u4eec\u60f3\u8981\u653e\u5f03\u672c\u5730\u67d0\u4e2a\u6587\u4ef6\u7684\u4fee\u6539\uff1a<\/p>\n\n\n\n<pre class=\"EnlighterJSRAW\" data-enlighter-language=\"generic\" data-enlighter-theme=\"\" data-enlighter-highlight=\"\" data-enlighter-linenumbers=\"\" data-enlighter-lineoffset=\"\" data-enlighter-title=\"\" data-enlighter-group=\"\">git checkout file-name  # \u4ece\u6682\u5b58\u533a\u91cc<\/pre>\n\n\n\n<p><strong>3.\u5df2\u7ecf\u63d0\u4ea4\u5c1a\u672a\u63a8\u9001\u5230\u8fdc\u7aef\u4ed3\u5e93<\/strong><\/p>\n\n\n\n<hr class=\"wp-block-separator has-alpha-channel-opacity\"\/>\n\n\n\n<p>\u6709\u65f6\u5019\uff0c\u6211\u4eec\u5728\u672c\u5730\u7684\u4fee\u6539\uff0c\u53ef\u80fd\u63d0\u4ea4\u5230\u4e86\u672c\u5730\u4ed3\u5e93\uff0c\u4f46\u662f\u5c1a\u672a<code>push<\/code>\u5230\u8fdc\u7a0b\u4ed3\u5e93\uff0c\u9488\u5bf9\u8fd9\u4e00\u79cd\u573a\u666f\u7684<\/p>\n\n\n\n<p>\u56de\u6eda\u662f\u6bd4\u8f83\u7b80\u5355\u7684\uff0c\u5982\u4e0b\u56fe\u6240\u793a\uff1a<\/p>\n\n\n<div class=\"wp-block-image\">\n<figure class=\"aligncenter size-large is-resized\"><img loading=\"lazy\" decoding=\"async\" width=\"1024\" height=\"868\" src=\"https:\/\/92it.top\/wp-content\/uploads\/2024\/09\/\u56fe\u7247-51-1024x868.png\" alt=\"\" class=\"wp-image-16271\" style=\"width:540px;height:auto\" srcset=\"https:\/\/92it.top\/wp-content\/uploads\/2024\/09\/\u56fe\u7247-51-1024x868.png 1024w, https:\/\/92it.top\/wp-content\/uploads\/2024\/09\/\u56fe\u7247-51-300x254.png 300w, https:\/\/92it.top\/wp-content\/uploads\/2024\/09\/\u56fe\u7247-51-768x651.png 768w, https:\/\/92it.top\/wp-content\/uploads\/2024\/09\/\u56fe\u7247-51-830x704.png 830w, https:\/\/92it.top\/wp-content\/uploads\/2024\/09\/\u56fe\u7247-51-230x195.png 230w, https:\/\/92it.top\/wp-content\/uploads\/2024\/09\/\u56fe\u7247-51-350x297.png 350w, https:\/\/92it.top\/wp-content\/uploads\/2024\/09\/\u56fe\u7247-51-480x407.png 480w, https:\/\/92it.top\/wp-content\/uploads\/2024\/09\/\u56fe\u7247-51.png 1248w\" sizes=\"(max-width: 1024px) 100vw, 1024px\" \/><\/figure><\/div>\n\n\n<p><code>origin\/master<\/code>\u6307\u5411\u4e86<code>5ff5433b<\/code>\u8fd9\u4e2a<code>commit<\/code>\uff0c\u672c\u5730\u6709\u4e09\u4e2a<code>commit<\/code>\uff0c\u73b0\u5728\u60f3\u9488\u5bf9\u8fd9\u4e09\u4e2a<code>commit<\/code>\u4f5c\u56de\u6eda\uff0c\u53ef\u4ee5\u4f7f\u7528<code>git reset<\/code>\u547d\u4ee4\u6765\u505a\uff0c<code>reset<\/code>\u53c2\u6570\u5982\u4e0b\uff1a<\/p>\n\n\n\n<ul>\n<li><code>--soft<\/code>\uff1a\u7f13\u5b58\u533a\u548c\u5de5\u4f5c\u76ee\u5f55\u90fd\u4e0d\u4f1a\u88ab\u6539\u53d8\u3002<\/li>\n\n\n\n<li><code>--mixed<\/code>\uff1a\u9ed8\u8ba4\u9009\u9879\u3002\u4f60\u6307\u5b9a\u7684\u63d0\u4ea4\u540c\u6b65\uff0c\u4f46\u5de5\u4f5c\u76ee\u5f55\u4e0d\u53d7\u5f71\u54cd\u3002<\/li>\n\n\n\n<li><code>--hard<\/code>\uff1a\u7f13\u5b58\u533a\u548c\u5de5\u4f5c\u76ee\u5f55\u7f13\u5b58\u533a\u548c\u90fd\u540c\u6b65\u5230\u4f60\u6307\u5b9a\u7684\u63d0\u4ea4\u3002<\/li>\n<\/ul>\n\n\n\n<p><code>git reset --hard HEAD~{n}<\/code>\u5c31\u662f\u628a<code>HEAD<\/code>\u6307\u9488\u56de\u9000<code>n<\/code>\u4e2a\u7248\u672c\uff08commit\uff09\uff0c\u5e76\u4e14\u4f7f\u7528\u8be5<code>commit<\/code>\u7684\u5185\u5bb9\u8986\u76d6\u6389\u5de5\u4f5c\u533a\u7684\u5185\u5bb9\uff0c\u5373\u4e22\u5f03\u4e86\u524d\u9762<code>n<\/code>\u4e2a<code>commit<\/code>\u7684\u4fee\u6539\u548c\u5f53\u524d\u5de5\u4f5c\u533a\u7684\u4fee\u6539\u3002\u7136\u540e\u8c03\u7528<code>git push origin master<\/code>\u63a8\u9001\u5230\u8fdc\u7a0b\u4ed3\u5e93\u3002<\/p>\n\n\n\n<p><strong>4.\u5df2\u7ecf\u63d0\u4ea4\u5230 remote \u4ed3\u5e93\u00a0<\/strong><\/p>\n\n\n\n<hr class=\"wp-block-separator has-alpha-channel-opacity\"\/>\n\n\n\n<p>\u5728\u4f7f\u7528Git\u8fdb\u884c\u7248\u672c\u63a7\u5236\u65f6\uff0c\u5982\u679c\u6211\u4eec\u5df2\u7ecf\u5c06\u672c\u5730\u7684\u4ee3\u7801\u63d0\u4ea4\uff08push\uff09\u5230\u4e86\u8fdc\u7a0b\u4ed3\u5e93\uff0c\u90a3\u4e48\u6211\u4eec\u9700\u8981\u8003\u8651\u4e24\u79cd\u60c5\u51b5\u3002<\/p>\n\n\n\n<p>\u9996\u5148\uff0c\u6211\u4eec\u9700\u8981\u5224\u65ad\u6211\u4eec\u63d0\u4ea4\u7684\u4ee3\u7801\u662f\u5426\u6709\u5176\u4ed6\u540c\u4e8b\u5df2\u7ecf\u5728\u6b64\u57fa\u7840\u4e0a\u8fdb\u884c\u4e86\u4fee\u6539\uff0c\u5e76\u4e14\u5c06\u8fd9\u4e9b\u4fee\u6539\u4e5f\u63a8\u9001\u5230\u8fdc\u7a0b\u4ed3\u5e93\u3002\u5982\u679c\u5176\u4ed6\u540c\u4e8b\u5df2\u7ecf\u5728\u6211\u4eec\u7684\u63d0\u4ea4\u4e4b\u4e0a\u8fdb\u884c\u4e86\u4fee\u6539\uff0c\u5e76\u4e14\u8fd9\u4e9b\u4fee\u6539\u5df2\u7ecf\u88ab\u63a8\u9001\uff0c\u90a3\u4e48\u5982\u679c\u6211\u4eec\u76f4\u63a5\u56de\u9000\uff08\u4f8b\u5982\u4f7f\u7528&nbsp;<code>git reset<\/code>\uff09\uff0c\u5c06\u4f1a\u5bfc\u81f4\u8fd9\u4e9b\u540c\u4e8b\u7684\u4fee\u6539\u88ab\u4e22\u5f03\u3002\u540c\u65f6\uff0c\u8fd9\u79cd\u64cd\u4f5c\u8fd8\u4f1a\u5220\u9664\u5386\u53f2\u8bb0\u5f55\uff0c\u8fd9\u53ef\u80fd\u4e0d\u7b26\u5408\u6211\u4eec\u7684\u9884\u671f\uff0c\u5c24\u5176\u662f\u5728\u56e2\u961f\u534f\u4f5c\u4e2d\uff0c\u8fd9\u4f1a\u5bf9\u540c\u4e8b\u7684\u5de5\u4f5c\u9020\u6210\u5f71\u54cd\u3002<\/p>\n\n\n\n<p>\u53e6\u4e00\u65b9\u9762\uff0c\u5982\u679c\u6ca1\u6709\u5176\u4ed6\u540c\u4e8b\u5728\u6211\u4eec\u7684\u63d0\u4ea4\u4e0a\u8fdb\u884c\u4fee\u6539\uff0c\u90a3\u4e48\u6211\u4eec\u53ef\u4ee5\u8003\u8651\u4f7f\u7528&nbsp;<code>git revert<\/code>&nbsp;\u6765\u56de\u9000\u6211\u4eec\u7684\u63d0\u4ea4\u3002\u8fd9\u79cd\u65b9\u6cd5\u4f1a\u521b\u5efa\u4e00\u4e2a\u65b0\u7684\u63d0\u4ea4\uff0c\u4ee5\u62b5\u6d88\u6211\u4eec\u60f3\u8981\u56de\u9000\u7684\u90a3\u4e2a\u63d0\u4ea4\uff0c\u8fd9\u6837\u65e2\u4fdd\u7559\u4e86\u5386\u53f2\u8bb0\u5f55\uff0c\u4e5f\u4e0d\u4f1a\u5f71\u54cd\u5230\u5176\u4ed6\u540c\u4e8b\u7684\u5de5\u4f5c\u3002<\/p>\n\n\n\n<p>\u6709\u4e9b\u4eba\u53ef\u80fd\u4f1a\u95ee\uff0c\u4e3a\u4ec0\u4e48\u4e0d\u4f7f\u7528&nbsp;<code>git reset<\/code>&nbsp;\u5462\uff1f\u56e0\u4e3a&nbsp;<code>git reset<\/code>&nbsp;\u4f1a\u5b8c\u5168\u5220\u9664\u5173\u4e8e\u6307\u5b9a\u63d0\u4ea4\u7684\u5386\u53f2\u8bb0\u5f55\uff0c\u8fd9\u6837\u4e0d\u4ec5\u4f1a\u5bfc\u81f4\u8bb0\u5f55\u7684\u4e0d\u5b8c\u6574\uff0c\u4e5f\u4f1a\u5bf9\u56e2\u961f\u4e2d\u7684\u5176\u4ed6\u6210\u5458\u4ea7\u751f\u8d1f\u9762\u5f71\u54cd\u3002\u56e0\u6b64\uff0c\u4f7f\u7528&nbsp;<code>git revert<\/code>&nbsp;\u662f\u66f4\u597d\u7684\u9009\u62e9\u3002<\/p>\n\n\n\n<p>\u5177\u4f53\u6765\u8bf4\uff0c\u5047\u8bbe\u6211\u4eec\u5f53\u524d\u6709\u4e09\u4e2a\u63d0\u4ea4\uff0c\u5982\u679c\u6211\u4eec\u5e0c\u671b\u56de\u9000\u5230\u67d0\u4e2a\u7279\u5b9a\u7684\u63d0\u4ea4\uff08\u6bd4\u5982&nbsp;<code>d061cb3<\/code>\uff09\uff0c\u800c\u8fd9\u4e2a\u63d0\u4ea4\u4e4b\u540e\u7684\u5de5\u4f5c\u5e76\u4e0d\u662f\u6211\u4eec\u60f3\u8981\u7684\uff0c\u90a3\u4e48\u6211\u4eec\u5e94\u5f53\u4f7f\u7528&nbsp;<code>git revert d061cb3<\/code>&nbsp;\u6765\u8fdb\u884c\u56de\u9000\u64cd\u4f5c\u3002\u8fd9\u6837\u505a\u53ef\u4ee5\u786e\u4fdd\u6211\u4eec\u7684\u64cd\u4f5c\u662f\u5b89\u5168\u7684\uff0c\u5e76\u4e14\u7b26\u5408\u56e2\u961f\u534f\u4f5c\u7684\u6700\u4f73\u5b9e\u8df5\u3002<\/p>\n\n\n\n<p>\u793a\u4f8b\uff1a<\/p>\n\n\n\n<pre class=\"EnlighterJSRAW\" data-enlighter-language=\"generic\" data-enlighter-theme=\"\" data-enlighter-highlight=\"\" data-enlighter-linenumbers=\"\" data-enlighter-lineoffset=\"\" data-enlighter-title=\"\" data-enlighter-group=\"\">git revert d061cb3 # \u56e0\u4e3a4bff67b\u662f\u665a\u4e8ed061cb3\u7684\uff0c\u5982\u679c\u8fd9\u4e24\u4e2a\u4fee\u6539\u7684\u5185\u5bb9\u6709\u4f9d\u8d56\uff0c\u662f\u4f1a\u6709\u51b2\u7a81\u7684\uff0c\n                   # \u5f53\u7136\u5982\u679c\u60f3\u53d6\u6d88\u8fd9\u6b21\u56de\u9000\u53ef\u4ee5\u4f7f\u7528\uff0cgit revert --abort\nfix conflict  # \u624b\u52a8\u53bb\u89e3\u51b3\u51b2\u7a81\ngit commit  # \u7136\u540e\u63d0\u4ea4\uff0c\u6b64\u65f6\u4f7f\u7528git log\u4f1a\u53d1\u73b0\u539f\u7406\u7684git commit\u8bb0\u5f55\u8fd8\u5728\uff0c\n            # \u4f46\u662f\u589e\u52a0\u4e86\u4e00\u4e2arevert\u7684\u8bb0\u5f55\ngit push    # \u63a8\u9001\u81f3\u8fdc\u7a0b\u5e93<\/pre>\n\n\n\n<p>\u5982\u679c\u6709\u5176\u5b83\u540c\u4e8b\u57fa\u4e8e\u6211\u4eec\u7684<code>commit<\/code>\u505a\u4fee\u6539\u7684\u8bdd\uff0c\u6211\u4eec\u56de\u9000\u7248\u672c\u7684\u65f6\u5019\u4e0d\u60f3\u628a\u4ed6\u7684\u63d0\u4ea4\u7ed9\u56de\u9000<br>\u6389\uff0c\u6bd4\u5982\u60f3\u56de\u6eda\u5230<code>5ff5433b<\/code>\u8fd9\u91cc\uff0c\u4f46\u662f\u6709\u5176\u4ed6\u4eba\u7684\u4e00\u4e2a\u63d0\u4ea4\u6211\u4e0d\u80fd\u56de\u6eda\u6389\uff0c\u8981\u4fdd\u5b58\u4ed6\u7684\u4ee3\u7801\uff0c<br>\u800c\u4e14\u5982\u679c\u6709\u591a\u4e2a\u540c\u4e8b\u7684\u4fee\u6539\u5728\u5728<code>5ff5433b<\/code>\u4e4b\u540e\u7684\uff0c\u90a3\u600e\u4e48\u529e\u5462\uff1f<\/p>\n\n\n\n<p>\u6bd4\u8f83\u597d\u7684\u505a\u6cd5\u5c31\u662f\u4ece<code>5ff5433b<\/code>\u62c9\u53d6\u4e00\u4e2a\u65b0\u7684\u5206\u652f\uff08\u5206\u652f\u540d\u662f<code>reset_to_5ff5433b<\/code>\uff09, \u56e0\u4e3a\u8fd9\u4e2a\u65b0\u5206<br>\u652f\u4e0d\u5305\u542b\u8981\u56de\u6eda\u7684\u4ee3\u7801\uff0c\u6b64\u65f6\u6211\u4eec\u53ef\u4ee5\u628a\u5176\u5b83\u540c\u4e8b\u7684\u4fee\u6539\u624b\u52a8\u5408\u5e76\u5230<code>reset_to_5ff5433b<\/code>\u5206\u652f\uff0c\u63a5\u7740<br>\u5207\u6362\u5230<code>master<\/code>\u5206\u652f\u4e0a\uff0c\u4f7f\u7528<code>git merge reset_to_5ff5433b<\/code>\u53bb\u5408\u5e76\u5206\u652f\u5230<code>master<\/code>\u4e0a\u3002\u8fd9\u4e5f\u5c31\u662f\u5206\u652f\u64cd\u4f5c\u7684\u77e5\u8bc6\u70b9\u3002<\/p>\n\n\n\n<pre class=\"EnlighterJSRAW\" data-enlighter-language=\"generic\" data-enlighter-theme=\"\" data-enlighter-highlight=\"\" data-enlighter-linenumbers=\"\" data-enlighter-lineoffset=\"\" data-enlighter-title=\"\" data-enlighter-group=\"\"># \u4ece5ff5433bd1fe4\u5904\u521b\u5efa\u5206\u652f\uff0c\u5373\u4ee3\u7801\u662f5ff5433bd1fe4\u5904\u7684\u4ee3\u7801\n$ git checkout -b reset_to_5ff5433b 5ff5433bd1fe4 \n# \u67e5\u770bmaster\u5206\u652f\u4e0a\u7684\u5176\u5b83\u540c\u4e8b\u7684\u63d0\u4ea4\uff08\u6bd4\u5982KING\uff09\uff0c\u628a\u4ed6\u7684\u4fee\u6539\u5728\u65b0\u5206\u652f\u4e0a\u518d\u4fee\u6539\u4e00\u904d \n$ git show 9d531db98276 \n$ git commit \u2013a \u2013m \"reverted 5ff5433b\"\n# \u5207\u6362\u5230master\u5206\u652f\n$ git checkout master \n$ git merge reset_to_5ff5433b\n$ git push #\u63a8\u9001\u5230\u8fdc\u7a0b\u4ed3\u5e93\n\n\n<\/pre>\n\n\n\n<p><strong>5.\u907f\u514d\u9891\u7e41\u56de\u9000\u00a0<\/strong><\/p>\n\n\n\n<hr class=\"wp-block-separator has-alpha-channel-opacity\"\/>\n\n\n\n<p>\u5728\u65e5\u5e38\u5f00\u53d1\u4e2d\uff0c\u9891\u7e41\u56de\u9000\uff08\u5373\u4f7f\u7528\u00a0<code>git revert<\/code>\u00a0\u6216\u00a0<code>git reset<\/code>\uff09\u53ef\u80fd\u4f1a\u5f71\u54cd\u5de5\u4f5c\u6548\u7387\u548c\u4ee3\u7801\u7684\u6574\u6d01\u6027\u3002\u5e94\u5f53\u907f\u514d\u9891\u7e41\u56de\u9000\uff1a<\/p>\n\n\n\n<ol>\n<li><strong>\u5b9a\u671f\u63d0\u4ea4<\/strong>\uff1a\u5c06\u5de5\u4f5c\u5206\u89e3\u6210\u5c0f\u7684\u3001\u53ef\u7ba1\u7406\u7684\u4efb\u52a1\uff0c\u5e76\u5728\u5b8c\u6210\u6bcf\u4e2a\u5c0f\u4efb\u52a1\u540e\u63d0\u4ea4\u3002\u8fd9\u4f7f\u5f97\u6bcf\u4e2a\u63d0\u4ea4\u90fd\u6bd4\u8f83\u5c0f\uff0c\u56de\u9000\u65f6\u4e0d\u4f1a\u5f71\u54cd\u592a\u591a\u4ee3\u7801\u3002<\/li>\n\n\n\n<li><strong>\u5199\u6e05\u6670\u7684\u63d0\u4ea4\u4fe1\u606f<\/strong>\uff1a\u786e\u4fdd\u6bcf\u6b21\u63d0\u4ea4\u7684\u4fe1\u606f\u6e05\u695a\u660e\u4e86\uff0c\u8bf4\u660e\u4f60\u505a\u4e86\u4ec0\u4e48\u4ee5\u53ca\u4e3a\u4ec0\u4e48\u505a\u3002\u8fd9\u6837\u5728\u9700\u8981\u56de\u9000\u65f6\uff0c\u53ef\u4ee5\u66f4\u5bb9\u6613\u5730\u7406\u89e3\u4ee3\u7801\u66f4\u6539\u7684\u5386\u53f2\u3002<\/li>\n\n\n\n<li><strong>\u4f7f\u7528\u5206\u652f<\/strong>\uff1a\u5728\u5f00\u53d1\u65b0\u7279\u6027\u6216\u8005\u8fdb\u884c\u5927\u6539\u52a8\u65f6\uff0c\u4f7f\u7528\u5206\u652f\uff08\u4f8b\u5982 feature \u5206\u652f\uff09\u8fdb\u884c\u5f00\u53d1\u3002\u8fd9\u6837\u53ef\u4ee5\u5728\u4e3b\u5206\u652f\u4e0a\u4fdd\u6301\u7a33\u5b9a\uff0c\u5f00\u53d1\u5b8c\u6210\u540e\u518d\u5408\u5e76\u3002<\/li>\n\n\n\n<li><strong>\u4ee3\u7801\u5ba1\u67e5<\/strong>\uff1a\u5728\u5408\u5e76\u4ee3\u7801\u4e4b\u524d\uff0c\u8fdb\u884c\u4ee3\u7801\u5ba1\u67e5\uff0c\u786e\u4fdd\u4ee3\u7801\u7684\u8d28\u91cf\u4ee5\u53ca\u903b\u8f91\u7684\u6b63\u786e\u6027\u3002\u8fd9\u6837\u53ef\u4ee5\u51cf\u5c11\u56e0\u9519\u8bef\u800c\u5bfc\u81f4\u7684\u56de\u9000\u3002<\/li>\n\n\n\n<li><strong>\u6d4b\u8bd5<\/strong>\uff1a\u5728\u63d0\u4ea4\u4e4b\u524d\u8fdb\u884c\u6d4b\u8bd5\uff0c\u786e\u4fdd\u6240\u6709\u529f\u80fd\u6b63\u5e38\u3002\u8fd9\u53ef\u4ee5\u5927\u5927\u51cf\u5c11\u540e\u7eed\u56de\u9000\u7684\u53ef\u80fd\u6027\u3002<\/li>\n\n\n\n<li><strong>\u5229\u7528\u6682\u5b58\u533a<\/strong>\uff1a\u4f7f\u7528\u00a0<strong>git add -p<\/strong>\u00a0\u9009\u62e9\u6027\u5730\u6dfb\u52a0\u66f4\u6539\u5230\u6682\u5b58\u533a\uff0c\u8fd9\u6837\u53ef\u4ee5\u66f4\u597d\u5730\u63a7\u5236\u54ea\u4e9b\u66f4\u6539\u4f1a\u88ab\u63d0\u4ea4\uff0c\u4ece\u800c\u907f\u514d\u4e0d\u5fc5\u8981\u7684\u9519\u8bef\u63d0\u4ea4\u3002<\/li>\n\n\n\n<li><strong>\u5206\u9636\u6bb5\u5f00\u53d1<\/strong>\uff1a\u5982\u679c\u67d0\u4e2a\u7279\u6027\u8f83\u590d\u6742\uff0c\u53ef\u4ee5\u5c06\u5176\u5206\u6210\u51e0\u4e2a\u9636\u6bb5\u6765\u5f00\u53d1\u3002\u6bcf\u5b8c\u6210\u4e00\u4e2a\u9636\u6bb5\uff0c\u5c31\u8fdb\u884c\u4e00\u6b21\u63d0\u4ea4\uff0c\u53ef\u4ee5\u51cf\u5c11\u5927\u89c4\u6a21\u7684\u56de\u9000\u3002<\/li>\n\n\n\n<li><strong>\u4f7f\u7528\u6807\u7b7e<\/strong>\uff1a\u5728\u91cd\u8981\u7684\u7248\u672c\u53d1\u5e03\u524d\u6253\u6807\u7b7e\uff08git tag\uff09\uff0c\u8fd9\u6837\u5728\u56de\u9000\u65f6\u53ef\u4ee5\u66f4\u65b9\u4fbf\u5730\u627e\u5230\u4e4b\u524d\u7684\u7a33\u5b9a\u7248\u3002<\/li>\n<\/ol>\n\n\n\n<p><strong>6.\u603b\u7ed3<\/strong><\/p>\n\n\n\n<hr class=\"wp-block-separator has-alpha-channel-opacity\"\/>\n\n\n\n<p>\u5728\u4f7f\u7528Git\u65f6\uff0c\u53ef\u80fd\u4f1a\u9047\u5230\u9700\u8981\u56de\u9000\u7684\u60c5\u51b5\u3002\u7406\u89e3\u548c\u638c\u63e1Git\u7684\u56de\u9000\u64cd\u4f5c\uff0c\u5bf9\u4e8e\u9ad8\u6548\u5730\u7ba1\u7406\u4ee3\u7801\u81f3\u5173\u91cd\u8981\u3002<\/p>\n\n\n\n<p><strong>Git\u7248\u672c\u56de\u9000\u7684\u4e3b\u8981\u65b9\u6cd5\uff1a<\/strong><\/p>\n\n\n\n<ul>\n<li><strong><code>git revert<\/code><\/strong>\uff1a\u7528\u4e8e\u64a4\u9500\u4e00\u4e2a\u63d0\u4ea4\u7684\u66f4\u6539\uff0c\u521b\u5efa\u4e00\u4e2a\u65b0\u7684\u63d0\u4ea4\u6765\u9006\u8f6c\u4e4b\u524d\u7684\u66f4\u6539\u3002\u8fd9\u662f\u4e00\u79cd\u5b89\u5168\u7684\u56de\u9000\u65b9\u6cd5\uff0c\u56e0\u4e3a\u5b83\u4fdd\u7559\u4e86\u5386\u53f2\u8bb0\u5f55\uff0c\u4e0d\u4f1a\u5f71\u54cd\u5230\u5176\u4ed6\u56e2\u961f\u6210\u5458\u7684\u5de5\u4f5c\u3002<\/li>\n\n\n\n<li><strong><code>git reset<\/code><\/strong>\uff1a\u7528\u4e8e\u91cd\u7f6e\u5f53\u524d\u5206\u652f\u5230\u6307\u5b9a\u7684\u63d0\u4ea4\uff0c\u53ef\u4ee5\u5220\u9664\u4e4b\u540e\u7684\u63d0\u4ea4\u8bb0\u5f55\u3002\u867d\u7136\u5b83\u53ef\u4ee5\u66f4\u5f7b\u5e95\u5730\u56de\u9000\u66f4\u6539\uff0c\u4f46\u5b83\u4f1a\u4fee\u6539\u63d0\u4ea4\u5386\u53f2\uff0c\u56e0\u6b64\u5728\u516c\u5171\u5206\u652f\u4e0a\u4f7f\u7528\u65f6\u9700\u8981\u5c0f\u5fc3\u3002<\/li>\n\n\n\n<li>\u8981\u907f\u514d\u9891\u7e41\u56de\u9000\u3002<\/li>\n<\/ul>\n\n\n\n<p>\u638c\u63e1Git\u4e0d\u4ec5\u4ec5\u662f\u4e86\u89e3\u5176\u57fa\u672c\u547d\u4ee4\uff0c\u66f4\u662f\u901a\u8fc7\u5b9e\u8df5\u6765\u771f\u6b63\u7406\u89e3\u5176\u5de5\u4f5c\u539f\u7406\u548c\u6700\u4f73\u4f7f\u7528\u65b9\u6cd5\u3002\u901a\u8fc7\u4e0d\u65ad\u7684\u5b9e\u8df5\u548c\u5b66\u4e60\uff0c\u5c06\u80fd\u591f\u66f4\u597d\u5730\u638c\u63e1Git\u7684\u4f7f\u7528\uff0c\u63d0\u9ad8\u4ee3\u7801\u7ba1\u7406\u7684\u80fd\u529b\u548c\u5f00\u53d1\u6548\u7387\u3002Git\u662f\u4e00\u4e2a\u5de5\u5177\uff0c\u800c\u7cbe\u901a\u5b83\u7684\u4f7f\u7528\u5c06\u4f7f\u4f60\u6210\u4e3a\u4e00\u4e2a\u66f4\u4f18\u79c0\u7684\u5f00\u53d1\u8005\u3002<\/p>\n","protected":false},"excerpt":{"rendered":"<p>1.Git\u7684\u5de5\u4f5c\u6d41\u7a0b \u5728\u8bb2\u8fd9\u4e2a\u7248\u672c\u56de\u9000\u4e4b\u524d\uff0c\u6211\u4eec\u8981\u6e29\u4e60\u4e00\u4e0bGit\u7684\u539f\u7406\u3002\u4e0b\u9762\u8fd9\u5f20\u56fe\u5c31\u662f\u00a0Git\u00a0\u7684\u6574\u4e2a\u5de5\u4f5c\u6d41\u7a0b [&hellip;]<\/p>\n","protected":false},"author":1,"featured_media":0,"comment_status":"closed","ping_status":"","sticky":false,"template":"","format":"standard","meta":{"footnotes":""},"categories":[30],"tags":[],"_links":{"self":[{"href":"https:\/\/92it.top\/index.php?rest_route=\/wp\/v2\/posts\/16269"}],"collection":[{"href":"https:\/\/92it.top\/index.php?rest_route=\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/92it.top\/index.php?rest_route=\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/92it.top\/index.php?rest_route=\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"https:\/\/92it.top\/index.php?rest_route=%2Fwp%2Fv2%2Fcomments&post=16269"}],"version-history":[{"count":1,"href":"https:\/\/92it.top\/index.php?rest_route=\/wp\/v2\/posts\/16269\/revisions"}],"predecessor-version":[{"id":16272,"href":"https:\/\/92it.top\/index.php?rest_route=\/wp\/v2\/posts\/16269\/revisions\/16272"}],"wp:attachment":[{"href":"https:\/\/92it.top\/index.php?rest_route=%2Fwp%2Fv2%2Fmedia&parent=16269"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/92it.top\/index.php?rest_route=%2Fwp%2Fv2%2Fcategories&post=16269"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/92it.top\/index.php?rest_route=%2Fwp%2Fv2%2Ftags&post=16269"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}