{"id":57244,"date":"2023-10-17T15:47:11","date_gmt":"2023-10-17T07:47:11","guid":{"rendered":"https:\/\/docs.pingcode.com\/?p=57244"},"modified":"2023-10-17T15:47:27","modified_gmt":"2023-10-17T07:47:27","slug":"%e8%81%8a%e8%81%8a%e5%a6%82%e4%bd%95%e4%bd%bf%e7%94%a8git%e5%8f%96%e6%b6%88%e4%bf%ae%e6%94%b9","status":"publish","type":"post","link":"https:\/\/docs.pingcode.com\/ask\/57244.html","title":{"rendered":"\u804a\u804a\u5982\u4f55\u4f7f\u7528git\u53d6\u6d88\u4fee\u6539"},"content":{"rendered":"\n<blockquote class=\"wp-block-quote\">\n<p>\u200b\u5728\u4ee3\u7801\u7ba1\u7406\u4e2d\uff0c\u5982\u4f55\u4f7f\u7528git\u6765\u64a4\u9500\u66f4\u6539\u662f\u4e00\u4e2a\u5e38\u89c1\u95ee\u9898\u3002\u672c\u6587\u5c06\u63a2\u8ba8\u4ee5\u4e0b\u6b65\u9aa4\uff1a1. \u4f7f\u7528git status\u67e5\u770b\u66f4\u6539\u72b6\u6001\uff1b2. \u4f7f\u7528git checkout\u64a4\u9500\u5de5\u4f5c\u533a\u66f4\u6539\uff1b3. \u4f7f\u7528git reset\u64a4\u9500\u6682\u5b58\u533a\u66f4\u6539\uff1b4. \u5982\u4f55\u64a4\u9500\u5df2\u63d0\u4ea4\u7684\u66f4\u6539\uff1b5. \u4f7f\u7528git revert\u548cgit reset\u7684\u533a\u522b\u3002\u4e86\u89e3\u8fd9\u4e9b\u57fa\u7840\u77e5\u8bc6\uff0c\u5c06\u5e2e\u52a9\u5f00\u53d1\u8005\u66f4\u7075\u6d3b\u5730\u5904\u7406\u4e0d\u540c\u7684\u64a4\u9500\u60c5\u5883\u3002<\/p>\n<\/blockquote>\n\n\n\n<h2 class=\"wp-block-heading\">1.\u4f7f\u7528git status\u67e5\u770b\u66f4\u6539\u72b6\u6001<\/h2>\n\n\n\n<p>\u5728\u8fdb\u884c\u4efb\u4f55\u64a4\u9500\u64cd\u4f5c\u4e4b\u524d\uff0c\u6211\u4eec\u9996\u5148\u9700\u8981\u77e5\u9053\u5f53\u524d\u7684\u66f4\u6539\u72b6\u6001\u3002<strong>git status<\/strong>\u547d\u4ee4\u4e3a\u6211\u4eec\u63d0\u4f9b\u4e86\u6b64\u4fe1\u606f\u3002\u8fd9\u4e2a\u547d\u4ee4\u663e\u793a\u4e86\u54ea\u4e9b\u6587\u4ef6\u88ab\u4fee\u6539\u4e86\u3001\u54ea\u4e9b\u88ab\u6682\u5b58\u4e86\uff0c\u4ee5\u53ca\u54ea\u4e9b\u8fd8\u6ca1\u6709\u88ab\u8ddf\u8e2a\u3002\u901a\u8fc7\u6b64\u547d\u4ee4\uff0c\u5f00\u53d1\u8005\u53ef\u4ee5\u66f4\u6e05\u6670\u5730\u4e86\u89e3\u4e0b\u4e00\u6b65\u5e94\u8be5\u5982\u4f55\u64cd\u4f5c\u3002<\/p>\n\n\n\n<h2 class=\"wp-block-heading\">2.\u4f7f\u7528git checkout\u64a4\u9500\u5de5\u4f5c\u533a\u66f4\u6539<\/h2>\n\n\n\n<p>\u5f53\u4f60\u5728\u5de5\u4f5c\u533a\u4fee\u6539\u4e86\u6587\u4ef6\uff0c\u4f46\u5c1a\u672a\u6682\u5b58\u65f6\uff0c\u53ef\u4ee5\u4f7f\u7528<strong>git checkout<\/strong>\u6765\u6062\u590d\u5230\u4e0a\u4e00\u6b21\u7684\u72b6\u6001\u3002\u4f8b\u5982\uff0c\u5982\u679c\u4f60\u66f4\u6539\u4e86\u540d\u4e3afile.txt\u7684\u6587\u4ef6\u5e76\u5e0c\u671b\u64a4\u9500\u8fd9\u4e9b\u66f4\u6539\uff0c\u53ef\u4ee5\u4f7f\u7528\uff1a<\/p>\n\n\n\n<pre class=\"wp-block-code\"><code>git checkout -- file.txt<\/code><\/pre>\n\n\n\n<p>\u8fd9\u5c06\u64a4\u9500file.txt\u4e2d\u7684\u6240\u6709\u672a\u6682\u5b58\u7684\u66f4\u6539\u3002<\/p>\n\n\n\n<h2 class=\"wp-block-heading\">3.\u4f7f\u7528git reset\u64a4\u9500\u6682\u5b58\u533a\u66f4\u6539<\/h2>\n\n\n\n<p>\u5982\u679c\u4f60\u5df2\u7ecf\u4f7f\u7528<strong>git add<\/strong>\u5c06\u66f4\u6539\u6dfb\u52a0\u5230\u6682\u5b58\u533a\uff0c\u4f46\u73b0\u5728\u60f3\u8981\u64a4\u9500\u8fd9\u4e2a\u64cd\u4f5c\uff0c\u53ef\u4ee5\u4f7f\u7528<strong>git reset<\/strong>\u3002\u4f8b\u5982\uff0c\u8981\u64a4\u9500file.txt\u7684\u6682\u5b58\u66f4\u6539\uff0c\u53ef\u4ee5\u4f7f\u7528\uff1a<\/p>\n\n\n\n<pre class=\"wp-block-code\"><code>git reset file.txt<\/code><\/pre>\n\n\n\n<p>\u8fd9\u5c06\u628afile.txt\u4ece\u6682\u5b58\u533a\u79fb\u51fa\uff0c\u4f46\u5de5\u4f5c\u533a\u7684\u66f4\u6539\u5c06\u4fdd\u7559\u3002<\/p>\n\n\n\n<h2 class=\"wp-block-heading\">4.\u5982\u4f55\u64a4\u9500\u5df2\u63d0\u4ea4\u7684\u66f4\u6539<\/h2>\n\n\n\n<p>\u5df2\u7ecf\u4f7f\u7528<strong>git commit<\/strong>\u63d0\u4ea4\u7684\u66f4\u6539\u66f4\u96be\u64a4\u9500\uff0c\u4f46\u8fd8\u662f\u53ef\u4ee5\u505a\u5230\u3002\u6709\u4e24\u79cd\u4e3b\u8981\u65b9\u6cd5\u6765\u5904\u7406\u6b64\u95ee\u9898\uff1a\u4f7f\u7528<strong>git revert<\/strong>\u548c<strong>git reset<\/strong>\u3002<\/p>\n\n\n\n<ul>\n<li>\u4f7f\u7528git revert: \u8fd9\u4e2a\u547d\u4ee4\u4f1a\u521b\u5efa\u4e00\u4e2a\u65b0\u7684\u63d0\u4ea4\u6765\u64a4\u9500\u4e4b\u524d\u7684\u63d0\u4ea4\u3002\u4f8b\u5982\uff0c\u8981\u64a4\u9500\u4e0a\u4e00\u4e2a\u63d0\u4ea4\uff0c\u53ef\u4ee5\u4f7f\u7528\uff1a<\/li>\n<\/ul>\n\n\n\n<pre class=\"wp-block-code\"><code>git revert HEAD<\/code><\/pre>\n\n\n\n<p>\u8fd9\u6837\u4f1a\u751f\u6210\u4e00\u4e2a\u65b0\u7684\u63d0\u4ea4\u6765\u64a4\u9500\u4e4b\u524d\u7684\u64cd\u4f5c\uff0c\u4e14\u4e0d\u4f1a\u5f71\u54cd\u5386\u53f2\u8bb0\u5f55\u3002<\/p>\n\n\n\n<ul>\n<li>\u4f7f\u7528git reset: <strong>git reset<\/strong>\u547d\u4ee4\u53ef\u4ee5\u5c06HEAD\u548c\u5f53\u524d\u5206\u652f\u7684\u6307\u9488\u56de\u9000\u5230\u5148\u524d\u7684\u63d0\u4ea4\u3002\u4f8b\u5982\uff0c\u4f7f\u7528\uff1a<\/li>\n<\/ul>\n\n\n\n<pre class=\"wp-block-code\"><code>git reset HEAD~1<\/code><\/pre>\n\n\n\n<p>\u5c06\u4f7f\u4f60\u7684\u5206\u652f\u56de\u9000\u5230\u4e0a\u4e00\u4e2a\u63d0\u4ea4\u3002\u4f46\u8981\u5c0f\u5fc3\uff0c\u8fd9\u4f1a\u91cd\u5199\u63d0\u4ea4\u5386\u53f2\u3002<\/p>\n\n\n\n<h2 class=\"wp-block-heading\">5.\u4f7f\u7528git revert\u548cgit reset\u7684\u533a\u522b<\/h2>\n\n\n\n<p>\u5c3d\u7ba1\u8fd9\u4e24\u4e2a\u547d\u4ee4\u90fd\u7528\u4e8e\u64a4\u9500\u66f4\u6539\uff0c\u4f46\u5b83\u4eec\u7684\u4f7f\u7528\u573a\u666f\u548c\u5f71\u54cd\u662f\u4e0d\u540c\u7684\u3002<strong>git revert<\/strong>\u662f\u66f4\u52a0\u5b89\u5168\u7684\u65b9\u5f0f\uff0c\u56e0\u4e3a\u5b83\u4e0d\u4f1a\u66f4\u6539\u5386\u53f2\u8bb0\u5f55\uff0c\u800c<strong>git reset<\/strong>\u5b9e\u9645\u4e0a\u662f\u91cd\u5199\u4e86\u63d0\u4ea4\u5386\u53f2\u3002\u5728\u56e2\u961f\u534f\u4f5c\u4e2d\uff0c\u5982\u679c\u4f60\u5df2\u7ecf\u5c06\u66f4\u6539\u63a8\u9001\u5230\u8fdc\u7a0b\u4ed3\u5e93\uff0c\u5efa\u8bae\u4f7f\u7528<strong>git revert<\/strong>\u4ee5\u907f\u514d\u51b2\u7a81\u548c\u56f0\u60d1\u3002<\/p>\n\n\n\n<p>\u603b\u7ed3\uff1a \u6b63\u786e\u5730\u4f7f\u7528git\u6765\u64a4\u9500\u66f4\u6539\u662f\u6bcf\u4e2a\u5f00\u53d1\u8005\u90fd\u5e94\u8be5\u638c\u63e1\u7684\u6280\u80fd\u3002\u65e0\u8bba\u662f\u56de\u9000\u5230\u4e0a\u4e00\u4e2a\u72b6\u6001\uff0c\u8fd8\u662f\u5b8c\u5168\u64a4\u9500\u67d0\u6b21\u63d0\u4ea4\uff0c\u90fd\u6709\u5bf9\u5e94\u7684git\u547d\u4ee4\u53ef\u4ee5\u5e2e\u52a9\u4f60\u5b9e\u73b0\u3002\u4e86\u89e3\u8fd9\u4e9b\u57fa\u7840\u547d\u4ee4\u548c\u5b83\u4eec\u7684\u5dee\u5f02\uff0c\u5c06\u4f7f\u4f60\u5728\u65e5\u5e38\u5f00\u53d1\u4e2d\u66f4\u52a0\u5f97\u5fc3\u5e94\u624b\u3002<\/p>\n\n\n\n<figure class=\"wp-block-image size-full\"><img fetchpriority=\"high\" decoding=\"async\" width=\"1280\" height=\"850\" src=\"https:\/\/cdn-docs.pingcode.com\/wp-content\/uploads\/2023\/10\/\u5982\u4f55\u4e0b\u8f7dgithub\u7684\u6587\u4ef6-2023-10-17T154425.759.jpg?x-oss-process=image\/auto-orient,1\/format,webp\" alt=\"\" class=\"wp-image-57245\" srcset=\"https:\/\/cdn-docs.pingcode.com\/wp-content\/uploads\/2023\/10\/\u5982\u4f55\u4e0b\u8f7dgithub\u7684\u6587\u4ef6-2023-10-17T154425.759.jpg 1280w, https:\/\/cdn-docs.pingcode.com\/wp-content\/uploads\/2023\/10\/\u5982\u4f55\u4e0b\u8f7dgithub\u7684\u6587\u4ef6-2023-10-17T154425.759-768x510.jpg 768w\" sizes=\"(max-width: 1280px) 100vw, 1280px\" \/><\/figure>\n\n\n\n<p><strong>\u5e38\u89c1\u95ee\u7b54\uff1a<\/strong><\/p>\n\n\n\n<ul>\n<li><strong>Q1: \u5982\u679c\u6211\u5728\u672c\u5730\u4fee\u6539\u4e86\u591a\u4e2a\u6587\u4ef6\uff0c\u4f46\u662f\u53ea\u60f3\u64a4\u9500\u67d0\u4e00\u4e2a\u6587\u4ef6\u7684\u4fee\u6539\u600e\u4e48\u529e\uff1f<\/strong><\/li>\n\n\n\n<li><strong>A1:<\/strong> \u5982\u679c\u4f60\u60f3\u64a4\u9500\u67d0\u4e00\u4e2a\u6587\u4ef6\u7684\u4fee\u6539\uff0c\u4f60\u53ef\u4ee5\u4f7f\u7528\u4ee5\u4e0b\u547d\u4ee4\uff0c\u5176\u4e2d<strong>your-file-name.txt<\/strong>\u662f\u4f60\u60f3\u64a4\u9500\u4fee\u6539\u7684\u6587\u4ef6\u540d:git checkout &#8212; your-file-name.txt\u8fd9\u4e2a\u547d\u4ee4\u5c06\u4f7f<strong>your-file-name.txt<\/strong>\u6587\u4ef6\u56de\u5230\u6700\u8fd1\u4e00\u6b21<strong>git commit<\/strong>\u6216<strong>git add<\/strong>\u7684\u72b6\u6001\u3002<\/li>\n<\/ul>\n\n\n\n<ul>\n<li><strong>Q2: \u5982\u679c\u6211\u4f7f\u7528\u4e86git commit\u4f46\u73b0\u5728\u60f3\u64a4\u9500\u8fd9\u6b21\u63d0\u4ea4\u600e\u4e48\u529e\uff1f<\/strong><\/li>\n\n\n\n<li><strong>A2:<\/strong> \u5982\u679c\u4f60\u60f3\u64a4\u9500\u6700\u8fd1\u4e00\u6b21\u7684\u63d0\u4ea4\uff0c\u4f60\u53ef\u4ee5\u4f7f\u7528\u4ee5\u4e0b\u547d\u4ee4:git reset HEAD~1\u8fd9\u5c06\u64a4\u9500\u6700\u8fd1\u4e00\u6b21\u7684<strong>git commit<\/strong>\u64cd\u4f5c\uff0c\u4f46\u662f\u4f60\u5728\u5de5\u4f5c\u533a\u7684\u4fee\u6539\u4f1a\u88ab\u4fdd\u7559\u3002<\/li>\n<\/ul>\n\n\n\n<ul>\n<li><strong>Q3: \u5982\u4f55\u64a4\u9500git push\u4e4b\u540e\u7684\u4fee\u6539\uff1f<\/strong><\/li>\n\n\n\n<li><strong>A3:<\/strong> \u5982\u679c\u4f60\u5df2\u7ecf\u5c06\u4fee\u6539\u63a8\u9001\u5230\u8fdc\u7a0b\u4ed3\u5e93\u5e76\u5e0c\u671b\u64a4\u9500\uff0c\u4f60\u53ef\u4ee5\u9996\u5148\u521b\u5efa\u4e00\u4e2a\u65b0\u7684\u63d0\u4ea4\u6765\u64a4\u9500\u4e4b\u524d\u7684\u63d0\u4ea4\uff0c\u4f7f\u7528\u4ee5\u4e0b\u547d\u4ee4:git revert HEAD\uff0c\u7136\u540e\u518d\u4f7f\u7528<strong>git push<\/strong>\u5c06\u4fee\u6539\u63a8\u9001\u5230\u8fdc\u7a0b\u4ed3\u5e93\u3002<\/li>\n<\/ul>\n","protected":false},"excerpt":{"rendered":"\u200b\u5728\u4ee3\u7801\u7ba1\u7406\u4e2d\uff0c\u5982\u4f55\u4f7f\u7528git\u6765\u64a4\u9500\u66f4\u6539\u662f\u4e00\u4e2a\u5e38\u89c1\u95ee\u9898\u3002\u672c\u6587\u5c06\u63a2\u8ba8\u4ee5\u4e0b\u6b65\u9aa4\uff1a1. \u4f7f\u7528git status\u67e5\u770b [&hellip;]","protected":false},"author":7,"featured_media":57246,"comment_status":"closed","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"_acf_changed":false,"footnotes":""},"categories":[37],"tags":[2752,2628,1163],"acf":[],"_links":{"self":[{"href":"https:\/\/docs.pingcode.com\/wp-json\/wp\/v2\/posts\/57244"}],"collection":[{"href":"https:\/\/docs.pingcode.com\/wp-json\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/docs.pingcode.com\/wp-json\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/docs.pingcode.com\/wp-json\/wp\/v2\/users\/7"}],"replies":[{"embeddable":true,"href":"https:\/\/docs.pingcode.com\/wp-json\/wp\/v2\/comments?post=57244"}],"version-history":[{"count":0,"href":"https:\/\/docs.pingcode.com\/wp-json\/wp\/v2\/posts\/57244\/revisions"}],"wp:featuredmedia":[{"embeddable":true,"href":"https:\/\/docs.pingcode.com\/wp-json\/wp\/v2\/media\/57246"}],"wp:attachment":[{"href":"https:\/\/docs.pingcode.com\/wp-json\/wp\/v2\/media?parent=57244"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/docs.pingcode.com\/wp-json\/wp\/v2\/categories?post=57244"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/docs.pingcode.com\/wp-json\/wp\/v2\/tags?post=57244"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}