{"id":4378,"date":"2022-03-20T00:07:03","date_gmt":"2022-03-19T16:07:03","guid":{"rendered":"https:\/\/egonlin.com\/?p=4378"},"modified":"2022-06-09T15:51:13","modified_gmt":"2022-06-09T07:51:13","slug":"%e7%ac%ac%e4%ba%8c%e7%ab%a0%ef%bc%9agit%e7%9a%84%e5%9f%ba%e6%9c%ac%e4%bd%bf%e7%94%a8","status":"publish","type":"post","link":"https:\/\/egonlin.com\/?p=4378","title":{"rendered":"\u7b2c\u4e8c\u7ae0\uff1aGit\u7684\u57fa\u672c\u4f7f\u7528"},"content":{"rendered":"<h1>GIT\u7684\u57fa\u672c\u4f7f\u7528<\/h1>\n<h2>1\u3001\u521b\u5efa\u4ed3\u5e93\u5e76\u521d\u59cb\u5316<\/h2>\n<pre><code class=\"language-python\">\/\/\u67e5\u770b\u67d0\u4e2a\u547d\u4ee4\u6587\u6863\ngit help &lt;command&gt;\ngit &lt;command&gt; -h\ngit &lt;command&gt; --help\n\n# 1\u3001\u521b\u5efa\u4ed3\u5e93\nmkdir \/Users\/linhaifeng\/pro \n\n# 2\u3001\u521d\u59cb\u5316\uff0c\u8868\u793a\u5373\u5c06\u5bf9\u5f53\u524d\u6587\u4ef6\u5939\u8fdb\u884c\u7248\u672c\u63a7\u5236\ncd \/Users\/linhaifeng\/pro \ngit init \n\n#\u6ce8\u610f\n1\u3001\n\u521b\u5efa\u7248\u672c\u5e93,\u7248\u672c\u5e93\u53c8\u540d\u4ed3\u5e93\uff0c\u82f1\u6587\u540drepository\uff0c\u4f60\u53ef\u4ee5\u7b80\u5355\u7406\u89e3\u6210\u4e00\u4e2a\u76ee\u5f55\uff0c\u8fd9\u4e2a\u76ee\u5f55\u91cc\u9762\u7684\u6240\u6709\u6587\u4ef6\u90fd\u53ef\u4ee5\u88abGit\u7ba1\u7406\u8d77\u6765\uff0c\u6bcf\u4e2a\u6587\u4ef6\u7684\u4fee\u6539\u3001\u5220\u9664\uff0cGit\u90fd\u80fd\u8ddf\u8e2a\uff0c\u4ee5\u4fbf\u4efb\u4f55\u65f6\u523b\u90fd\u53ef\u4ee5\u8ffd\u8e2a\u5386\u53f2\uff0c\u6216\u8005\u5728\u5c06\u6765\u67d0\u4e2a\u65f6\u523b\u53ef\u4ee5\u201c\u8fd8\u539f\u201d\u3002\n\n2\u3001\n\u5728\u4ed3\u5e93\u76ee\u5f55\u4e0b\u6267\u884cgit init\u540e\u4f1a\u751f\u6210\u4e00\u4e2a\u9690\u85cf\u76ee\u5f55.git,\u8be5\u9690\u85cf\u76ee\u5f55\u5c31\u662fGit\u7528\u6765\u8ddf\u8e2a\u7ba1\u7406\u7248\u672c\u5e93\u7684\uff0c\u6ca1\u4e8b\u5343\u4e07\u4e0d\u8981\u624b\u52a8\u4fee\u6539\u8fd9\u4e2a\u76ee\u5f55\u91cc\u9762\u7684\u6587\u4ef6\uff0c\u4e0d\u7136\u6539\u4e71\u4e86\uff0c\u5c31\u628aGit\u4ed3\u5e93\u7ed9\u7834\u574f\u4e86\u3002\n\n3\u3001\n\u5982\u679c\u4f60\u4f7f\u7528Windows\u7cfb\u7edf\uff0c\u4e3a\u4e86\u907f\u514d\u9047\u5230\u5404\u79cd\u83ab\u540d\u5176\u5999\u7684\u95ee\u9898\uff0c\u8bf7\u786e\u4fdd\u76ee\u5f55\u540d\uff08\u5305\u62ec\u7236\u76ee\u5f55\uff09\u4e0d\u5305\u542b\u4e2d\u6587\u3002\n\n4\u3001\n\u540e\u671f\u7684git\u547d\u4ee4\u90fd\u9700\u8981\u5728\u4ed3\u5e93\u76ee\u5f55\u4e0b\u6267\u884c\uff0c\u5728\u4ed3\u5e93\u76ee\u5f55\u5916\u6267\u884cgit\u547d\u4ee4\u662f\u6ca1\u6709\u610f\u4e49\u7684<\/code><\/pre>\n<h2>2\u3001\u5de5\u4f5c\u533a\u4e0e\u7248\u672c\u5e93<\/h2>\n<p>Git\u53ea\u80fd\u7ba1\u7406\u6587\u672c\u6587\u4ef6\u4e0d\u80fd\u7ba1\u7406\u4e8c\u8fdb\u5236\u6587\u4ef6<\/p>\n<pre><code class=\"language-go\">\u6240\u6709\u7684\u7248\u672c\u63a7\u5236\u7cfb\u7edf\uff0c\u5176\u5b9e\u53ea\u80fd\u8ddf\u8e2a\u6587\u672c\u6587\u4ef6\u7684\u6539\u52a8\uff0c\u6bd4\u5982TXT\u6587\u4ef6\uff0c\u7f51\u9875\uff0c\u6240\u6709\u7684\u7a0b\u5e8f\u4ee3\u7801\u7b49\u7b49\uff0cGit\u4e5f\u4e0d\u4f8b\u5916\u3002\u7248\u672c\u63a7\u5236\u7cfb\u7edf\u53ef\u4ee5\u544a\u8bc9\u4f60\u6bcf\u6b21\u7684\u6539\u52a8\uff0c\u6bd4\u5982\u5728\u7b2c5\u884c\u52a0\u4e86\u4e00\u4e2a\u5355\u8bcd\u201cLinux\u201d\uff0c\u5728\u7b2c8\u884c\u5220\u4e86\u4e00\u4e2a\u5355\u8bcd\u201cWindows\u201d\u3002\u800c\u56fe\u7247\u3001\u89c6\u9891\u8fd9\u4e9b\u4e8c\u8fdb\u5236\u6587\u4ef6\uff0c\u867d\u7136\u4e5f\u80fd\u7531\u7248\u672c\u63a7\u5236\u7cfb\u7edf\u7ba1\u7406\uff0c\u4f46\u6ca1\u6cd5\u8ddf\u8e2a\u6587\u4ef6\u7684\u53d8\u5316\uff0c\u53ea\u80fd\u628a\u4e8c\u8fdb\u5236\u6587\u4ef6\u6bcf\u6b21\u6539\u52a8\u4e32\u8d77\u6765\uff0c\u4e5f\u5c31\u662f\u53ea\u77e5\u9053\u56fe\u7247\u4ece100KB\u6539\u6210\u4e86120KB\uff0c\u4f46\u5230\u5e95\u6539\u4e86\u5565\uff0c\u7248\u672c\u63a7\u5236\u7cfb\u7edf\u4e0d\u77e5\u9053\uff0c\u4e5f\u6ca1\u6cd5\u77e5\u9053\u3002\n\n\u4e0d\u5e78\u7684\u662f\uff0cMicrosoft\u7684Word\u683c\u5f0f\u662f\u4e8c\u8fdb\u5236\u683c\u5f0f\uff0c\u56e0\u6b64\uff0c\u7248\u672c\u63a7\u5236\u7cfb\u7edf\u662f\u6ca1\u6cd5\u8ddf\u8e2aWord\u6587\u4ef6\u7684\u6539\u52a8\u7684\uff0c\u524d\u9762\u6211\u4eec\u4e3e\u7684\u4f8b\u5b50\u53ea\u662f\u4e3a\u4e86\u6f14\u793a\uff0c\u5982\u679c\u8981\u771f\u6b63\u4f7f\u7528\u7248\u672c\u63a7\u5236\u7cfb\u7edf\uff0c\u5c31\u8981\u4ee5\u7eaf\u6587\u672c\u65b9\u5f0f\u7f16\u5199\u6587\u4ef6\u3002\n\n\u56e0\u4e3a\u6587\u672c\u662f\u6709\u7f16\u7801\u7684\uff0c\u6bd4\u5982\u4e2d\u6587\u6709\u5e38\u7528\u7684GBK\u7f16\u7801\uff0c\u65e5\u6587\u6709Shift_JIS\u7f16\u7801\uff0c\u5982\u679c\u6ca1\u6709\u5386\u53f2\u9057\u7559\u95ee\u9898\uff0c\u5f3a\u70c8\u5efa\u8bae\u4f7f\u7528\u6807\u51c6\u7684UTF-8\u7f16\u7801\uff0c\u6240\u6709\u8bed\u8a00\u4f7f\u7528\u540c\u4e00\u79cd\u7f16\u7801\uff0c\u65e2\u6ca1\u6709\u51b2\u7a81\uff0c\u53c8\u88ab\u6240\u6709\u5e73\u53f0\u6240\u652f\u6301\u3002\n\n\u4f7f\u7528Windows\u7684\u7ae5\u978b\u8981\u7279\u522b\u6ce8\u610f\uff1a\n\n\u5343\u4e07\u4e0d\u8981\u4f7f\u7528Windows\u81ea\u5e26\u7684**\u8bb0\u4e8b\u672c**\u7f16\u8f91\u4efb\u4f55\u6587\u672c\u6587\u4ef6\u3002\u539f\u56e0\u662fMicrosoft\u5f00\u53d1\u8bb0\u4e8b\u672c\u7684\u56e2\u961f\u4f7f\u7528\u4e86\u4e00\u4e2a\u975e\u5e38\u5f31\u667a\u7684\u884c\u4e3a\u6765\u4fdd\u5b58UTF-8\u7f16\u7801\u7684\u6587\u4ef6\uff0c\u4ed6\u4eec\u81ea\u4f5c\u806a\u660e\u5730\u5728\u6bcf\u4e2a\u6587\u4ef6\u5f00\u5934\u6dfb\u52a0\u4e860xefbbbf\uff08\u5341\u516d\u8fdb\u5236\uff09\u7684\u5b57\u7b26\uff0c\u4f60\u4f1a\u9047\u5230\u5f88\u591a\u4e0d\u53ef\u601d\u8bae\u7684\u95ee\u9898\uff0c\u6bd4\u5982\uff0c\u7f51\u9875\u7b2c\u4e00\u884c\u53ef\u80fd\u4f1a\u663e\u793a\u4e00\u4e2a\u201c?\u201d\uff0c\u660e\u660e\u6b63\u786e\u7684\u7a0b\u5e8f\u4e00\u7f16\u8bd1\u5c31\u62a5\u8bed\u6cd5\u9519\u8bef\uff0c\u7b49\u7b49\uff0c\u90fd\u662f\u7531\u8bb0\u4e8b\u672c\u7684\u5f31\u667a\u884c\u4e3a\u5e26\u6765\u7684\u3002\u5efa\u8bae\u4f60\u4e0b\u8f7dNotepad++\u4ee3\u66ff\u8bb0\u4e8b\u672c\uff0c\u4e0d\u4f46\u529f\u80fd\u5f3a\u5927\uff0c\u800c\u4e14\u514d\u8d39\uff01\u8bb0\u5f97\u628aNotepad++\u7684\u9ed8\u8ba4\u7f16\u7801\u8bbe\u7f6e\u4e3aUTF-8 without BOM\u5373\u53ef<\/code><\/pre>\n<p>Git\u6bcf\u4e00\u6b21\u63d0\u4ea4\u7248\u672c\u4fdd\u5b58\u7684\u90fd\u662f\u5bf9\u6587\u4ef6\u5185\u5bb9\u7684\u5b8c\u6574\u5feb\u7167\uff0c\u5feb\u7167\u4f5c\u4f55\u89e3\u91ca\u5462\uff1f<\/p>\n<ul>\n<li>\n<p>1\u3001\u9488\u5bf9\u5df2\u53d8\u5316\u7684\u6587\u4ef6\uff0c\u90a3\u4e48git\u4fdd\u5b58\u7684\u662f\u628a\u8be5\u6587\u4ef6\u7684\u5b8c\u6574\u5185\u5bb9\u62f7\u8d1d\u4e00\u4efd\u4fdd\u5b58\u4e0b\u6765\uff0c\u800c\u4e0d\u662f\u5dee\u5f02\u53d8\u5316\u6216\u8005\u6587\u4ef6\u8865\u4e01\u3002\u56e0\u6b64\u4f60\u53ef\u4ee5\u5b8c\u5168\u6062\u590d\u5230\u4ee5\u524d\u7684\u4efb\u4e00\u4e2a\u63d0\u4ea4\u800c\u4e0d\u4f1a\u53d1\u751f\u4efb\u4f55\u533a\u522b\u3002<\/p>\n<\/li>\n<li>\n<p>2\u3001\u672a\u53d8\u5316\u7684\u6587\u4ef6\u53ea\u4fdd\u5b58\u4e0a\u4e00\u4e2a\u7248\u672c\u7684\u6307\u9488<\/p>\n<\/li>\n<\/ul>\n<p>\u6240\u4ee5\uff1a<\/p>\n<pre><code>\u5982\u679c\u6211\u7684\u9879\u76ee\u5927\u5c0f\u662f10M\uff0c\u90a3Git\u5360\u7528\u7684\u7a7a\u95f4\u662f\u4e0d\u662f\u968f\u7740\u63d0\u4ea4\u6b21\u6570\u7684\u589e\u52a0\u7ebf\u6027\u589e\u52a0\u5462\uff1f\u6211\u63d0\u4ea4\uff08commit\uff09\u4e8610\u6b21\uff0c\u5360\u7528\u7a7a\u95f4\u662f\u4e0d\u662f100M\u5462\uff1f\u5f88\u663e\u7136\u4e0d\u662f\uff0cGit\u662f\u5f88\u667a\u80fd\u7684\uff0c\u5982\u679c\u6587\u4ef6\u6ca1\u6709\u53d8\u5316\uff0c\u5b83\u53ea\u4f1a\u4fdd\u5b58\u4e00\u4e2a\u6307\u5411\u4e0a\u4e00\u4e2a\u7248\u672c\u7684\u6587\u4ef6\u7684`\u6307\u9488`\uff0c\u5373\uff0c\u5bf9\u4e8e\u4e00\u4e2a\u7279\u5b9a\u7248\u672c\u7684\u6587\u4ef6\uff0cGit\u53ea\u4f1a\u4fdd\u5b58\u4e00\u4e2a\u526f\u672c\uff0c\u4f46\u53ef\u4ee5\u6709\u591a\u4e2a\u6307\u5411\u8be5\u6587\u4ef6\u7684`\u6307\u9488`\u3002<\/code><\/pre>\n<p>\u53e6\u5916\u6ce8\u610f<\/p>\n<pre><code class=\"language-go\">Git\u6700\u9002\u5408\u4fdd\u5b58\u6587\u672c\u6587\u4ef6\uff0c\u4e8b\u5b9e\u4e0aGit\u5c31\u662f\u88ab\u8bbe\u8ba1\u51fa\u6765\u5c31\u662f\u4e3a\u4e86\u4fdd\u5b58\u6587\u672c\u6587\u4ef6\u7684\uff0c\u50cf\u5404\u79cd\u8bed\u8a00\u7684\u6e90\u4ee3\u7801\uff0c\u56e0\u4e3aGit\u53ef\u4ee5\u5bf9\u6587\u672c\u6587\u4ef6\u8fdb\u884c\u5f88\u597d\u7684\u538b\u7f29\u548c\u5dee\u5f02\u5206\u6790\uff08\u5927\u5bb6\u90fd\u89c1\u8bc6\u8fc7\u4e86\uff0cGit\u7684\u5dee\u5f02\u5206\u6790\u53ef\u4ee5\u7cbe\u786e\u5230\u4f60\u6dfb\u52a0\u6216\u8005\u5220\u9664\u4e86\u67d0\u4e2a\u5b57\u6bcd\uff09\u3002\u800c\u4e8c\u8fdb\u5236\u6587\u4ef6\u50cf\u89c6\u9891\uff0c\u56fe\u7247\u7b49\uff0cGit\u4e5f\u80fd\u7ba1\u7406\uff0c\u4f46\u4e0d\u80fd\u53d6\u5f97\u8f83\u597d\u7684\u6548\u679c\uff08\u538b\u7f29\u6bd4\u7387\u4f4e\uff0c\u4e0d\u80fd\u5dee\u5f02\u5206\u6790\uff09\u3002\u5b9e\u9a8c\u8bc1\u660e\uff0c\u4e00\u4e2a 500k \u7684\u6587\u672c\u6587\u4ef6\u7ecfGit\u538b\u7f29\u540e\u4ec5 50k \u5de6\u53f3\uff0c\u7a0d\u5fae\u6539\u53d8\u5185\u5bb9\u540e\u4e24\u6b21\u63d0\u4ea4\uff0c\u4f1a\u6709\u4e24\u4e2a 50k \u5de6\u53f3\u7684\u6587\u4ef6\uff0c\u6ca1\u9519\u7684\uff0c\u4fdd\u5b58\u7684\u662f\u5b8c\u6574\u5feb\u7167\u3002\u800c\u5bf9\u4e8e\u4e8c\u8fdb\u5236\u6587\u4ef6\uff0c\u50cf\u89c6\u9891\uff0c\u56fe\u7247\uff0c\u538b\u7f29\u7387\u975e\u5e38\u5c0f\uff0c Git \u5360\u7528\u7a7a\u95f4\u51e0\u4e4e\u968f\u7740\u63d0\u4ea4\u6b21\u6570\u7ebf\u6027\u589e\u957f\u3002<\/code><\/pre>\n<p><div class='fancybox-wrapper lazyload-container-unload' data-fancybox='post-images' href='https:\/\/egonlin.com\/wp-content\/uploads\/2022\/03\/git\u5feb\u7167.png'><img class=\"lazyload lazyload-style-2\" src=\"data:image\/svg+xml;base64,PCEtLUFyZ29uTG9hZGluZy0tPgo8c3ZnIHdpZHRoPSIxIiBoZWlnaHQ9IjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgc3Ryb2tlPSIjZmZmZmZmMDAiPjxnPjwvZz4KPC9zdmc+\"  data-original=\"https:\/\/egonlin.com\/wp-content\/uploads\/2022\/03\/git\u5feb\u7167.png\" src=\"data:image\/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsQAAA7EAZUrDhsAAAANSURBVBhXYzh8+PB\/AAffA0nNPuCLAAAAAElFTkSuQmCC\" alt=\"\" \/><\/div><\/p>\n<p>Git\u628a\u7ba1\u7406\u7684\u6587\u672c\u6587\u4ef6\u5206\u4e3a\u4e24\u4e2a\u533a\u57df\u3001\u56db\u79cd\u72b6\u6001\u3002<\/p>\n<p><div class='fancybox-wrapper lazyload-container-unload' data-fancybox='post-images' href='https:\/\/egonlin.com\/wp-content\/uploads\/2022\/03\/\u4e24\u533a\u56db\u72b6\u6001.png'><img class=\"lazyload lazyload-style-2\" src=\"data:image\/svg+xml;base64,PCEtLUFyZ29uTG9hZGluZy0tPgo8c3ZnIHdpZHRoPSIxIiBoZWlnaHQ9IjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgc3Ryb2tlPSIjZmZmZmZmMDAiPjxnPjwvZz4KPC9zdmc+\"  data-original=\"https:\/\/egonlin.com\/wp-content\/uploads\/2022\/03\/\u4e24\u533a\u56db\u72b6\u6001.png\" src=\"data:image\/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsQAAA7EAZUrDhsAAAANSURBVBhXYzh8+PB\/AAffA0nNPuCLAAAAAElFTkSuQmCC\" alt=\"\" \/><\/div><\/p>\n<ul>\n<li>\n<p>1\u3001\u5de5\u4f5c\u533a\uff1a\u5373\u4ed3\u5e93\u76ee\u5f55<\/p>\n<pre><code class=\"language-python\"># \u5f53\u524d\u5f00\u53d1\u7a0b\u5e8f\u6240\u5728\u76ee\u5f55\u79f0\u4e3a\u5de5\u4f5c\u533a\uff0c\u5373\uff1a\u5de5\u4f5c\u5f00\u53d1\u90fd\u662f\u5728\u8be5\u76ee\u5f55\u3002\u5728\u6211\u4eec\u63d0\u4ea4\u4e00\u4e2a\u7248\u672c\u5230\u7248\u672c\u5e93\u540e\uff0cgit\u4f1a\u81ea\u52a8\u68c0\u6d4b\u81ea\u8be5\u7248\u672c\u4e4b\u540e\u6211\u4eec\u5bf9\u4ed3\u5e93\u76ee\u5f55\u4e0b\u6587\u4ef6\u7684\u6539\u52a8\uff08\u589e\u3001\u5220\u3001\u6539\uff09\uff0c\u5e76\u6807\u8bb0\u4e3a\u4fee\u6539\u8fc7\u7684\u5185\u5bb9\uff0c\u6211\u4eec\u53ef\u4ee5\u4f7f\u7528 \u3010git status\u3011\u547d\u4ee4\u67e5\u770b\uff0c\u5982\u4e0b\u6240\u793a\n\n$ cd \/Users\/linhaifeng\/pro  # \u5fc5\u987b\u786e\u4fdd\u5df2\u7ecf\u5728\u4ed3\u5e93\u76ee\u5f55\u4e0b\u6267\u884cgit\u547d\u4ee4\n\n$ git status # \u67e5\u770b\u5f53\u524dgit\u72b6\u6001\uff0c\u672a\u68c0\u6d4b\u5230\u4efb\u4f55\u53d8\u5316\n\n$ echo \"hello egon\" >> readme.txt # \u5728\u4ed3\u5e93\u76ee\u5f55\u4e0b\u6216\u4ed3\u5e93\u7684\u5b50\u76ee\u5f55\u4e0b\u65b0\u589e\u6587\u4ef6\n\n$ git status # git\u4f1a\u81ea\u52a8\u68c0\u6d4b\u5230\u5de5\u4f5c\u533a\u7684\u53d8\u5316\uff1a\u65b0\u589e\u4e86\u6587\u4ef6readme.txt,\u663e\u793a\u5185\u5bb9\u7565<\/code><\/pre>\n<\/li>\n<li>\n<p>2\u3001\u7248\u672c\u5e93\uff1a\u5373\u4ed3\u5e93\u76ee\u5f55\u4e0b\u7684.git\u76ee\u5f55\uff0c.git\u4e0d\u5c5e\u4e8e\u5de5\u4f5c\u533a<\/p>\n<pre><code class=\"language-python\"># \u5982\u679c\u6211\u4eec\u60f3\u5c06git\u68c0\u6d4b\u5230\u7684<code>\u4fee\u6539\u8fc7\u7684\u5185\u5bb9<\/code>\u63d0\u4ea4\u4e3a\u4e00\u4e2a\u65b0\u7684\u7248\u672c\uff0c\u9700\u8981\n# 1\u3001\u5148\u5c06git\u68c0\u6d4b\u5230\u7684<code>\u4fee\u6539\u8fc7\u7684\u5185\u5bb9<\/code>\u6dfb\u52a0\u5230\u6682\u5b58\u533a\uff0c\u7528\u5230\u3010git add\u3011\u547d\u4ee4\ngit add \u6587\u4ef61  # \u53ef\u4ee5\u6dfb\u52a0\u5355\u4e2a\u6587\u4ef6\ngit add \u6587\u4ef61 \u6587\u4ef62  # \u4e5f\u53ef\u4ee5\u6dfb\u52a0\u591a\u4e2a\u6587\u4ef6\ngit add . # \u4e5f\u53ef\u4ee5\u76f4\u63a5\u6dfb\u52a0\u6574\u4e2a\u5f53\u524d\u76ee\u5f55\n      #\u5f53\u7136\uff0c\u4e5f\u53ef\u4ee5add\u591a\u6b21\n\n# 2\u3001\u7136\u540e\u518d\u6267\u884c\u3010git commit -m '\u53c8\u4e00\u4e2a\u7248\u672c'\u3011\u63d0\u4ea4\u5230\u7248\u672c\u5e93\u7684\u5206\u652f\u5373\u53ef\ngit commit -m \"\u7b2c\u4e00\u6b21\u63d0\u4ea4\"\n\n# \u6ce8\u610f\uff1a\u6267\u884cgit commit \u547d\u4ee4\u65f6\uff0c\u53ef\u80fd\u4f1a\u63d0\u793a\u8fdb\u884c\u7528\u6237\u548c\u90ae\u7bb1\u7684\u914d\u7f6e\uff0c\u8be5\u914d\u7f6e\u7528\u4e8e\u8bb0\u5f55\u5f53\u524d\u7248\u672c\u7531\u90a3\u4e2a\u7528\u6237\u63d0\u4ea4\ngit config --local user.name 'egon'\ngit config --local user.email 'egon@example.com'\n\u914d\u7f6e\u7ea7\u522b\n\u2013local\uff08\u9ed8\u8ba4\uff0c\u9ad8\u7ea7\u4f18\u5148\uff09\uff1a\u53ea\u5f71\u54cd\u672c\u5730\u4ed3\u5e93\n\u2013global(\u4e2d\u4f18\u5148\u7ea7)\uff1a\u53ea\u5f71\u54cd\u6240\u6709\u5f53\u524d\u7528\u6237\u7684git\u4ed3\u5e93\n\u2013system\uff08\u4f4e\u4f18\u5148\u7ea7\uff09\uff1a\u5f71\u54cd\u5230\u5168\u7cfb\u7edf\u7684git\u4ed3\u5e93\n\n# 3\u3001\u4e4b\u540e\u53ef\u4ee5\u4f7f\u7528\u3010git log\u3011\u547d\u4ee4\u67e5\u770b\u7248\u672c\u8bb0\u5f55\u3002\ngit log\ngit log --pretty=oneline  # \u5982\u679c\u5acc\u8f93\u51fa\u4fe1\u606f\u592a\u591a,\u53ef\u4ee5\u52a0\u4e0a--pretty=oneline\u53c2\u6570\ngit log --color --graph\n\u67e5\u770breflog\uff0c\u7528\u4e8e\u627e\u5230\u56de\u6eda\u540e\u7684\u65e5\u5fd7\ngit reflog<\/code><\/pre>\n<\/li>\n<\/ul>\n<h2>3\u3001\u547d\u4ee4\u5c0f\u7ed3<\/h2>\n<p>\u76ee\u524d\u5df2\u4f7f\u7528\u547d\u4ee4\u5982\u4e0b\uff0c\u4f7f\u7528\u4e0b\u8ff0\u547d\u4ee4\u5df2\u7ecf\u53ef\u4ee5\u4ee3\u66ff\u672c\u5730\u591a\u4e2a\u6587\u4ef6\u4fdd\u5b58\u7248\u672c\u7684\u65b9\u5f0f<\/p>\n<pre><code class=\"language-python\"># \u4e00\uff1a\u521b\u5efa\u5e76\u521d\u59cb\u5316\u4ed3\u5e93\nmkdir \/Users\/linhaifeng\/pro  \ncd \/Users\/linhaifeng\/pro \ngit init \n\n# \u4e8c\uff1a\u8bbe\u7f6e\u7528\u6237\u4e0e\u90ae\u7bb1\ngit config --local user.name &#039;Egon&#039;\ngit config --local user.email &#039;egon@example.com&#039;\n\n# \u4e09\uff1a\u67e5\u770bGit\u5f53\u524d\u72b6\u6001\uff0c\u5982\uff1a\u54ea\u4e9b\u6587\u4ef6\u88ab\u4fee\u6539\u8fc7\u3001\u54ea\u4e9b\u6587\u4ef6\u8fd8\u5728\u6682\u5b58\u533a\u91cc\u5c1a\u672a\u88ab\u63d0\u4ea4\u5230\u7248\u672c\u5e93\u7b49\u3002\ngit status \n\n# \u56db\uff1a\u5c06\u68c0\u6d4b\u5230\u4fee\u6539\u7684\u6587\u4ef6\u6dfb\u52a0\u5230\u6682\u5b58\u533a\ngit add \u6587\u4ef6\u540d \n\n# \u4e94\uff1a\u5c06\u6682\u5b58\u533a\u7684\u6587\u4ef6\u63d0\u4ea4\u5230\u7248\u672c\u5e93\u7684\u5206\u652f\u3002\ngit commit -m &#039;\u63d0\u4ea4\u4fe1\u606f&#039; \n\n# \u516d\uff1a\u67e5\u770b\u63d0\u4ea4\u8bb0\u5f55\uff0c\u5373\uff1a\u5386\u53f2\u7248\u672c\u8bb0\u5f55\ngit log \ngit log --pretty=oneline \n\ngit reflog<\/code><\/pre>\n<h2>4\u3001\u7248\u672c\u56de\u9000\u4e0e\u524d\u8fdb<\/h2>\n<p>\u6211\u4eec\u521b\u5efaGit\u7248\u672c\u5e93\u65f6\uff0cGit\u81ea\u52a8\u4e3a\u6211\u4eec\u521b\u5efa\u4e86\u552f\u4e00\u4e00\u4e2a<code>master<\/code>\u5206\u652f\uff0c\u6240\u4ee5\uff0c\u76ee\u524d\u4e3a\u6b62\uff0c\u6211\u4eec\u6267\u884c\u7684<code>git commit<\/code>\u5c31\u662f\u5f80<code>master<\/code>\u5206\u652f\u4e0a\u63d0\u4ea4\u66f4\u6539\u3002<\/p>\n<p>Git\u7684\u7248\u672c\u5e93\u91cc\u5b58\u4e86\u5f88\u591a\u4e1c\u897f\uff0c\u5176\u4e2d\u6700\u91cd\u8981\u7684\u5c31\u662f\u79f0\u4e3astage\uff08\u6216\u8005\u53ebindex\uff09\u7684\u6682\u5b58\u533a\uff0c\u8fd8\u6709Git\u4e3a\u6211\u4eec\u81ea\u52a8\u521b\u5efa\u7684\u7b2c\u4e00\u4e2a\u5206\u652f<code>master<\/code>\uff0c\u4ee5\u53ca\u6307\u5411<code>master<\/code>\u7684\u4e00\u4e2a\u6307\u9488\u53eb<code>HEAD<\/code>\uff0c<code>HEAD<\/code>\u6307\u9488\u6307\u5411\u7684\u5c31\u662f\u5f53\u524d\u5728\u7528\u7684\u7248\u672c<\/p>\n<p><div class='fancybox-wrapper lazyload-container-unload' data-fancybox='post-images' href='https:\/\/egonlin.com\/wp-content\/uploads\/2022\/03\/\u6682\u5b58\u533a1.png'><img class=\"lazyload lazyload-style-2\" src=\"data:image\/svg+xml;base64,PCEtLUFyZ29uTG9hZGluZy0tPgo8c3ZnIHdpZHRoPSIxIiBoZWlnaHQ9IjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgc3Ryb2tlPSIjZmZmZmZmMDAiPjxnPjwvZz4KPC9zdmc+\"  data-original=\"https:\/\/egonlin.com\/wp-content\/uploads\/2022\/03\/\u6682\u5b58\u533a1.png\" src=\"data:image\/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsQAAA7EAZUrDhsAAAANSURBVBhXYzh8+PB\/AAffA0nNPuCLAAAAAElFTkSuQmCC\" alt=\"\" \/><\/div><div class='fancybox-wrapper lazyload-container-unload' data-fancybox='post-images' href='https:\/\/egonlin.com\/wp-content\/uploads\/2022\/03\/\u6682\u5b58\u533a2.png'><img class=\"lazyload lazyload-style-2\" src=\"data:image\/svg+xml;base64,PCEtLUFyZ29uTG9hZGluZy0tPgo8c3ZnIHdpZHRoPSIxIiBoZWlnaHQ9IjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgc3Ryb2tlPSIjZmZmZmZmMDAiPjxnPjwvZz4KPC9zdmc+\"  data-original=\"https:\/\/egonlin.com\/wp-content\/uploads\/2022\/03\/\u6682\u5b58\u533a2.png\" src=\"data:image\/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsQAAA7EAZUrDhsAAAANSURBVBhXYzh8+PB\/AAffA0nNPuCLAAAAAElFTkSuQmCC\" alt=\"\" \/><\/div><div class='fancybox-wrapper lazyload-container-unload' data-fancybox='post-images' href='https:\/\/egonlin.com\/wp-content\/uploads\/2022\/03\/\u6682\u5b58\u533a3.png'><img class=\"lazyload lazyload-style-2\" src=\"data:image\/svg+xml;base64,PCEtLUFyZ29uTG9hZGluZy0tPgo8c3ZnIHdpZHRoPSIxIiBoZWlnaHQ9IjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgc3Ryb2tlPSIjZmZmZmZmMDAiPjxnPjwvZz4KPC9zdmc+\"  data-original=\"https:\/\/egonlin.com\/wp-content\/uploads\/2022\/03\/\u6682\u5b58\u533a3.png\" src=\"data:image\/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsQAAA7EAZUrDhsAAAANSURBVBhXYzh8+PB\/AAffA0nNPuCLAAAAAElFTkSuQmCC\" alt=\"\" \/><\/div><\/p>\n<p>Git\u7684\u7248\u672c\u56de\u9000\u901f\u5ea6\u975e\u5e38\u5feb\uff0c\u56e0\u4e3a\u5f53\u4f60\u56de\u9000\u7248\u672c\u7684\u65f6\u5019\uff0cGit\u4ec5\u4ec5\u662f\u628aHEAD\u6307\u5411\u4e86\u4e00\u4e2a\u6307\u5b9a\u7684\u7248\u672c,\u7136\u540e\u987a\u4fbf\u628a\u5de5\u4f5c\u533a\u7684\u6587\u4ef6\u66f4\u65b0\u4e86\u3002<\/p>\n<p>\u4ece\u5f53\u524d\u7248\u672c\uff0c\u56de\u5230\u8fc7\u53bb\u7684\u7248\u672c\uff0c\u6309\u56fe\u6240\u793a\u662f\u5411\u5de6\u56de\u9000<\/p>\n<p><div class='fancybox-wrapper lazyload-container-unload' data-fancybox='post-images' href='https:\/\/egonlin.com\/wp-content\/uploads\/2022\/03\/\u56de\u5230\u8fc7\u53bb.png'><img class=\"lazyload lazyload-style-2\" src=\"data:image\/svg+xml;base64,PCEtLUFyZ29uTG9hZGluZy0tPgo8c3ZnIHdpZHRoPSIxIiBoZWlnaHQ9IjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgc3Ryb2tlPSIjZmZmZmZmMDAiPjxnPjwvZz4KPC9zdmc+\"  data-original=\"https:\/\/egonlin.com\/wp-content\/uploads\/2022\/03\/\u56de\u5230\u8fc7\u53bb.png\" src=\"data:image\/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsQAAA7EAZUrDhsAAAANSURBVBhXYzh8+PB\/AAffA0nNPuCLAAAAAElFTkSuQmCC\" alt=\"\" \/><\/div><\/p>\n<p>\u5f53\u524d\u7248\u672c\u4e3a\u7248\u672c3\uff0c\u56de\u9000\u5230\u7248\u672c1\uff0c\u547d\u4ee4\u5982\u4e0b<\/p>\n<pre><code class=\"language-python\"># 1\u3001\u67e5\u770b\u7248\u672c\u4fe1\u606f\n$ git log --pretty=oneline \n87e199e0a766ecb10028ab93fe57fb4b326445fa (HEAD -&gt; master) \u7248\u672c3\n353b5afb8784f0e19c8dab83be1cb97a93b13bd4 \u7248\u672c2\nb740905aaf2753572a714ccdf3bd58a1d437148a \u7248\u672c1\n\n# 2\u3001\u56de\u6eda\u5230\u4e0a\u4e00\u4e2a\u7248\u672c\n# 2.1 \u65b9\u5f0f1\uff1aHEAD\u6307\u5411\u5f53\u524d\u7248\u672c\uff0cHEAD^\u4ee3\u8868\u6307\u5411\u5f53\u524d\u7248\u672c\u7684\u4e0a\u4e00\u4e2a\uff0cHEAD^^\u4ee3\u8868\u6307\u5411\u5f53\u524d\u7248\u672c\u7684\u4e0a\u4e0a\u4e2a\uff0c\u4f9d\u6b21\u7c7b\u63a8\uff0cHEAD~n\u4ee3\u8868\u6307\u5411\u5f53\u524d\u7248\u672c\u7684\u4e0a\u4e0a\u4e0a...n\u4e2a\n$ git reset --hard HEAD^  # \u5982\u679c\u6267\u884c\u7684\u662fgit resert --hard HEAD~2 \u5f80\u540e\u6570\u4e24\u4e2a\u7248\u672c\uff0c\u5c31\u4f1a\u56de\u5230\u7248\u672c1\nHEAD is now at 353b5af \u7248\u672c2\n\n# 2.1 \u65b9\u5f0f2\uff1a\u56de\u5230\u67d0\u4e2a\u6307\u5b9a\u7684\u7248\u672c\u7528git log\u67e5\u8be2\u51fa\u7684commit id\u53f7\n$ git reset --hard 353b5afb8784f0e19c8dab83be1cb97a93b13bd4<\/code><\/pre>\n<p>\u4ece\u5f53\u524d\u7248\u672c\uff0c\u56de\u5230\u672a\u6765\u7684\u7248\u672c\uff0c\u6309\u56fe\u6240\u793a\u662f\u5411\u53f3\u524d\u8fdb<\/p>\n<p><div class='fancybox-wrapper lazyload-container-unload' data-fancybox='post-images' href='https:\/\/egonlin.com\/wp-content\/uploads\/2022\/03\/\u56de\u5230\u672a\u6765.png'><img class=\"lazyload lazyload-style-2\" src=\"data:image\/svg+xml;base64,PCEtLUFyZ29uTG9hZGluZy0tPgo8c3ZnIHdpZHRoPSIxIiBoZWlnaHQ9IjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgc3Ryb2tlPSIjZmZmZmZmMDAiPjxnPjwvZz4KPC9zdmc+\"  data-original=\"https:\/\/egonlin.com\/wp-content\/uploads\/2022\/03\/\u56de\u5230\u672a\u6765.png\" src=\"data:image\/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsQAAA7EAZUrDhsAAAANSURBVBhXYzh8+PB\/AAffA0nNPuCLAAAAAElFTkSuQmCC\" alt=\"\" \/><\/div><\/p>\n<p>\u5f53\u524d\u7248\u672c\u4e3a\u7248\u672c1\uff0c\u524d\u8fdb\u5230\u7248\u672c3\uff0c\u547d\u4ee4\u5982\u4e0b<\/p>\n<pre><code class=\"language-python\"> # 1\u3001\u7528git log\u67e5\u770b\u4f1a\u53d1\u73b0\u6700\u65b0\u7684\u7248\u672c\u201c\u7248\u672c3\u201d\u4e0d\u89c1\u4e86\uff01\uff01\uff01\n$ git log --pretty=oneline\n353b5afb8784f0e19c8dab83be1cb97a93b13bd4 (HEAD -&gt; master) \u7248\u672c2\nb740905aaf2753572a714ccdf3bd58a1d437148a \u7248\u672c1\n\n# 2\u3001\u6211\u4eec\u5f53\u7136\u53ef\u4ee5\u5728\u547d\u4ee4\u7ec8\u7aef\u4e2d\u5f80\u4e0a\u7ffb\u9605\u67e5\u627e\u5f53\u521d\u7248\u672c3\u8fd8\u5728\u65f6\uff0c\u6211\u4eec\u7528git log\u67e5\u51fa\u7684commit id\u8fdb\u884c\u64cd\u4f5c\uff0c\u4f46\u662f\u8fd9\u79cd\u505a\u6cd5\u6bd5\u7adf\u4e0d\u9760\u8c31\u3002\u6211\u4eec\u53ef\u4ee5\u7528\u66f4\u9760\u8c31\u7684\u547d\u4ee4\n$ git reflog\n......\n87e199e HEAD@{6}: commit: \u7248\u672c3\n353b5af HEAD@{7}: commit: \u7248\u672c2\nb740905 (HEAD -&gt; master) HEAD@{8}: commit (initial): \u7248\u672c1\n\n# 3\u3001\u524d\u8fdb\u5230\u7248\u672c3\n$ git reset --hard 87e199e\nHEAD is now at 87e199e \u7248\u672c3<\/code><\/pre>\n<p>\u603b\u7ed3\uff1a<\/p>\n<ul>\n<li>1\u3001<code>HEAD<\/code>\u6307\u5411\u7684\u7248\u672c\u5c31\u662f\u5f53\u524d\u7248\u672c\uff0c\u56e0\u6b64\uff0cGit\u5141\u8bb8\u6211\u4eec\u5728\u7248\u672c\u7684\u5386\u53f2\u4e4b\u95f4\u7a7f\u68ad\uff0c\u4f7f\u7528\u547d\u4ee4<code>git reset --hard commit_id<\/code>\u3002<\/li>\n<li>2\u3001\u7a7f\u68ad\u524d\uff0c\u7528<code>git log<\/code>\u53ef\u4ee5\u67e5\u770b\u63d0\u4ea4\u5386\u53f2\uff0c\u4ee5\u4fbf\u786e\u5b9a\u8981\u56de\u9000\u5230\u54ea\u4e2a\u7248\u672c\u3002<\/li>\n<li>3\u3001\u8981\u91cd\u8fd4\u672a\u6765\uff0c\u7528<code>git reflog<\/code>\u67e5\u770b\u547d\u4ee4\u5386\u53f2\uff0c\u4ee5\u4fbf\u786e\u5b9a\u8981\u56de\u5230\u672a\u6765\u7684\u54ea\u4e2a\u7248\u672c\u3002<\/li>\n<\/ul>\n<h2>5\u3001\u64a4\u9500\u4fee\u6539<\/h2>\n<p>\u573a\u666f1\uff1a\u5df2\u7ecf\u63d0\u4ea4\u4e86\u4e0d\u5408\u9002\u7684\u4fee\u6539\u5230\u7248\u672c\u5e93\u65f6\uff0c\u60f3\u8981\u64a4\u9500\u672c\u6b21\u63d0\u4ea4\uff0c\u53c2\u8003\u4e0a\u4e00\u5c0f\u8282\u7248\u672c\u56de\u9000\uff0c\u4e0d\u8fc7\u524d\u63d0\u662f\u6ca1\u6709\u63a8\u9001\u5230\u8fdc\u7a0b\u5e93\u3002<\/p>\n<p>\u573a\u666f2\uff1a<\/p>\n<p>\u200b   \u524d\u63d0\uff1a\u5982\u679c\u5f53\u524d\u6587\u4ef6\u7684\u5185\u5bb9\u5df2\u7ecf\u88ab\u63d0\u4ea4\u5230\u7248\u672c\u5e93<\/p>\n<p>\u200b   \u64cd\u4f5c\uff1a\u4e4b\u540e\u53c8\u4fee\u6539\u4e86\u8be5\u6587\u4ef6\uff0c\u5e76\u4e14git add\u6dfb\u52a0\u5230\u4e86\u6682\u5b58\u533a\uff0c\u540e\u7eed\u53c8\u4fee\u6539\u4e86\u6587\u4ef6<\/p>\n<p>\u200b   \u64a4\u9500\uff1a<\/p>\n<p>\u200b       <code>\u5148\u6267\u884c<\/code>git reset HEAD <file>`\u5c06\u6587\u4ef6\u4ece\u6682\u5b58\u533a\u62ff\u56de\u5de5\u4f5c\u533a<\/p>\n<p>\u200b       <code>\u518d\u6267\u884c<\/code>git checkout &#8212; <file>`\u5c06\u5de5\u4f5c\u533a\u7684\u4fee\u6539\u8fd8\u539f\u5230\u539f\u6765\u7684\u72b6\u6001\uff08\u5373\u4e0a\u4e00\u6b21git commit\u7684\u72b6\u6001\uff09<\/p>\n<p>\u573a\u666f3\uff1a<\/p>\n<p>\u200b   \u524d\u63d0\uff1a\u5982\u679c\u5f53\u524d\u6587\u4ef6\u7684\u5185\u5bb9\u4ece\u672a\u88ab\u63d0\u4ea4\u5230\u7248\u672c\u5e93<\/p>\n<p>\u200b   \u64cd\u4f5c\uff1a\u4fee\u6539\u4e86\u8be5\u6587\u4ef6\uff0c\u5e76\u4e14git add\u6dfb\u52a0\u5230\u4e86\u6682\u5b58\u533a\uff0c\u540e\u7eed\u53c8\u4fee\u6539\u4e86\u6587\u4ef6<\/p>\n<p>\u200b   \u64a4\u9500\uff1a<\/p>\n<p>\u200b       <code>\u6b64\u65f6\u65e0\u6cd5\u6267\u884c<\/code>git reset HEAD <file>`<\/p>\n<p>\u200b       <code>\u5e94\u8be5\u6267\u884c<\/code>git checkout &#8212; <file>`\u5c06\u5de5\u4f5c\u533a\u7684\u4fee\u6539\u8fd8\u539f\u5230git add\u65f6\u6587\u4ef6\u7684\u5185\u5bb9<\/p>\n<p>\u603b\u4e4b\uff0cgit checkout &#8212; <file><code>\u5c31\u662f\u8ba9\u8fd9\u4e2a\u6587\u4ef6\u56de\u5230\u6700\u8fd1\u4e00\u6b21<\/code>git commit<code>\u6216<\/code>git add`\u65f6\u7684\u72b6\u6001\u3002<br \/>\n<div class='fancybox-wrapper lazyload-container-unload' data-fancybox='post-images' href='https:\/\/egonlin.com\/wp-content\/uploads\/2022\/03\/image-1654758830092.png'><img class=\"lazyload lazyload-style-2\" src=\"data:image\/svg+xml;base64,PCEtLUFyZ29uTG9hZGluZy0tPgo8c3ZnIHdpZHRoPSIxIiBoZWlnaHQ9IjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgc3Ryb2tlPSIjZmZmZmZmMDAiPjxnPjwvZz4KPC9zdmc+\"  data-original=\"https:\/\/egonlin.com\/wp-content\/uploads\/2022\/03\/image-1654758830092.png\" src=\"data:image\/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsQAAA7EAZUrDhsAAAANSURBVBhXYzh8+PB\/AAffA0nNPuCLAAAAAElFTkSuQmCC\" alt=\"file\" \/><\/div><\/p>\n<p>\u6ce8\u610f\uff0c<\/p>\n<p><code>git checkout -- file<\/code>\u547d\u4ee4\u4e2d\u7684<code>--<\/code>\u5f88\u91cd\u8981\uff0c\u6ca1\u6709<code>--<\/code>\uff0c\u5c31\u53d8\u6210\u4e86\u201c\u5207\u6362\u5230\u53e6\u4e00\u4e2a\u5206\u652f\u201d\u7684\u547d\u4ee4\uff0c\u6211\u4eec\u5728\u540e\u9762\u7684\u5206\u652f\u7ba1\u7406\u4e2d\u4f1a\u518d\u6b21\u9047\u5230<code>git checkout<\/code>\u547d\u4ee4\u3002<\/p>\n<h2>6\u3001\u7ba1\u7406\u4fee\u6539<\/h2>\n<p>Git\u6bd4\u5176\u4ed6\u7248\u672c\u63a7\u5236\u7cfb\u7edf\u4f18\u79c0\u7684\u4e00\u4e2a\u91cd\u8981\u539f\u56e0\u5c31\u662f\uff1aGit\u8ddf\u8e2a\u5e76\u7ba1\u7406\u7684\u662f\u4fee\u6539\uff0c\u800c\u975e\u6587\u4ef6\u3002\u6bcf\u6b21\u4fee\u6539\u90fd\u9700\u8981\u5148add\u5230\u6682\u5b58\u533a\uff0c\u624d\u80fd\u63d0\u4ea4\u5230\u7248\u672c\u5e93\uff0c\u5982\u679c\u6bcf\u6b21\u4fee\u6539\u540e\uff0c\u4e0d\u7528add\u6dfb\u52a0\u5230\u6682\u5b58\u533a\uff0c\u5c31\u4e0d\u4f1a\u88abcommit\u63d0\u4ea4\u5230\u7248\u672c\u5e93<\/p>\n<pre><code class=\"language-python\">$ echo &quot;hello&quot; &gt; a.txt # \u7b2c\u4e00\u6b21\u4fee\u6539\n$ git add a.txt \n$ echo &quot;world&quot; &gt;&gt; a.txt  # \u7b2c\u4e8c\u6b21\u4fee\u6539\uff0c\u672c\u6b21\u4fee\u6539\u5e76\u6ca1\u6709add\u5230\u6682\u5b58\u533a\uff0c\u6682\u5b58\u533a\u7684a.txt\u5185\u5bb9\u4e3a\u201chello\u201d\n$ git commit -m &quot;\u7248\u672c1&quot; # \u628a\u6682\u5b58\u533a\u7684\u5185\u5bb9\u63d0\u4ea4\u5230\u7248\u672c\u5e93\n\n$ git status  # \u67e5\u770b\u5230\u7b2c\u4e8c\u6b21\u4fee\u6539\u4ecd\u7136\u5b58\u5728\u4e8e\u5de5\u4f5c\u533a\uff0c\u5e76\u672a\u63d0\u4ea4\n$ git diff HEAD -- a.txt # \u53ef\u4ee5\u7528\u547d\u4ee4\u67e5\u770b\u7248\u672c\u5e93\u6700\u65b0\u7248\u672c\u4e0e\u5de5\u4f5c\u533a\u7684\u533a\u522b\ndiff --git a\/a.txt b\/a.txt\nindex ce01362..94954ab 100644\n--- a\/a.txt\n+++ b\/a.txt\n@@ -1 +1,2 @@\n hello\n+world<\/code><\/pre>\n<p>\u4e0a\u8ff0\u60c5\u51b5\uff0c\u6211\u4eec\u53ef\u4ee5\u5728\u7248\u672c1\u7684\u57fa\u7840\u4e0a\u7ee7\u7eed\u64cd\u4f5c\uff1a\u5c06\u7b2c\u4e8c\u6b21\u4fee\u6539\u4e5fadd\u5230\u6682\u5b58\u533a\uff0c\u7136\u540e\u518dcommit\u4e00\u4e2a\u201c\u7248\u672c2\u201d\u5230\u7248\u672c\u5e93\uff0c\u4e5f\u53ef\u4ee5\u5728\u5f53\u521d\u7684\u65f6\u5019\u5148\u522b\u7740\u6025\u5c06\u7b2c\u4e00\u6b21\u7684\u4fee\u6539commit\u63d0\u4ea4\u6210\u201d\u7248\u672c1\u201c\uff0c\u5148\u5c06\u7b2c\u4e8c\u6b21\u4fee\u6539\u7684\u5185\u5bb9\u4e5fadd\u5230\u6682\u5b58\u533a\uff0c\u7136\u540e\u4e0e\u7b2c\u4e00\u6b21\u7684\u4fee\u6539\u5408\u5e76\u5230\u4e00\u8d77\u63d0\u4ea4\u6210\u4e00\u4e2a\u7248\u672c<\/p>\n<h2>7\u3001\u5220\u9664\u6587\u4ef6<\/h2>\n<p>\u5728Git\u4e2d\uff0c\u5220\u9664\u4e5f\u662f\u4e00\u4e2a\u4fee\u6539\u64cd\u4f5c\uff0c\u6211\u4eec\u5b9e\u6218\u4e00\u4e0b\uff0c\u5148\u6dfb\u52a0\u4e00\u4e2a\u65b0\u6587\u4ef6<code>test.txt<\/code>\u5230Git\u5e76\u4e14\u63d0\u4ea4\uff1a<\/p>\n<pre><code>$ git add test.txt\n\n$ git commit -m &quot;v1&quot;<\/code><\/pre>\n<p>\u4e00\u822c\u60c5\u51b5\u4e0b\uff0c\u4f60\u901a\u5e38\u76f4\u63a5\u5728\u6587\u4ef6\u7ba1\u7406\u5668\u4e2d\u628a\u6ca1\u7528\u7684\u6587\u4ef6\u5220\u4e86\uff0c\u6216\u8005\u7528<code>rm<\/code>\u547d\u4ee4\u5220\u4e86\uff1a<\/p>\n<pre><code>$ rm test.txt<\/code><\/pre>\n<p>\u8fd9\u4e2a\u65f6\u5019\uff0cGit\u77e5\u9053\u4f60\u5220\u9664\u4e86\u6587\u4ef6\uff0c\u56e0\u6b64\uff0c\u5de5\u4f5c\u533a\u548c\u7248\u672c\u5e93\u5c31\u4e0d\u4e00\u81f4\u4e86\uff0c<code>git status<\/code>\u547d\u4ee4\u4f1a\u7acb\u523b\u544a\u8bc9\u4f60\u54ea\u4e9b\u6587\u4ef6\u88ab\u5220\u9664\u4e86\uff1a<\/p>\n<pre><code>$ git status\nOn branch master\nChanges not staged for commit:\n  (use &quot;git add\/rm &lt;file&gt;...&quot; to update what will be committed)\n  (use &quot;git checkout -- &lt;file&gt;...&quot; to discard changes in working directory)\n\n    deleted:    test.txt\n\nno changes added to commit (use &quot;git add&quot; and\/or &quot;git commit -a&quot;)<\/code><\/pre>\n<p>\u73b0\u5728\u4f60\u6709\u4e24\u4e2a\u9009\u62e9\uff0c\u4e00\u662f\u786e\u5b9e\u8981\u4ece\u7248\u672c\u5e93\u4e2d\u5220\u9664\u8be5\u6587\u4ef6\uff0c\u90a3\u5c31\u7528\u547d\u4ee4<code>git rm<\/code>\u5220\u6389\uff0c\u5e76\u4e14<code>git commit<\/code>\uff1a<\/p>\n<pre><code>$ git rm -f test.txt\nrm &#039;test.txt&#039;\n\n$ git commit -m &quot;remove test.txt&quot;\n[master d46f35e] remove test.txt\n 1 file changed, 1 deletion(-)\n delete mode 100644 test.txt<\/code><\/pre>\n<p>\u73b0\u5728\uff0c\u6587\u4ef6\u5c31\u4ece\u7248\u672c\u5e93\u4e2d\u88ab\u5220\u9664\u4e86\u3002<\/p>\n<p>\u8865\u5145\uff1a<\/p>\n<pre><code class=\"language-python\">\u53ef\u4ee5\u914d\u7f6e.gitignore\u914d\u7f6e\u5ffd\u7565\u6587\u4ef6\uff0c\u8fd9\u4e9b\u6587\u4ef6\u4e0d\u88abgit\u8ffd\u8e2a\n\ngit rm --cached :\u4ec5\u4ece\u6682\u5b58\u533a\u5220\u9664\ngit rm :\u4ece\u6682\u5b58\u533a\u4e0e\u5de5\u4f5c\u76ee\u5f55\u540c\u65f6\u5220\u9664\ngit rm $(git ls-files --deleted):\u5220\u9664\u6240\u6709\u88ab\u8ddf\u8e2a\uff0c\u4f46\u662f\u5728\u5de5\u4f5c\u76ee\u5f55\u88ab\u5220\u9664\u7684\u6587\u4ef6<\/code><\/pre>\n<p>\u5c0f\u63d0\u793a\uff1a\u5148\u624b\u52a8\u5220\u9664\u6587\u4ef6\uff0c\u7136\u540e\u4f7f\u7528git rm <file>\u548cgit add<file>\u6548\u679c\u662f\u4e00\u6837\u7684\uff0c\u90fd\u4f1a\u4ece\u7248\u672c\u5e93\u4e2d\u5220\u9664\u6389\u6587\u4ef6\u3002<\/p>\n<p>\u53e6\u4e00\u79cd\u60c5\u51b5\u662f\u5220\u9519\u4e86\uff0c\u56e0\u4e3a\u7248\u672c\u5e93\u91cc\u8fd8\u6709\u5462\uff0c\u6240\u4ee5\u53ef\u4ee5\u5f88\u8f7b\u677e\u5730\u628a\u8bef\u5220\u7684\u6587\u4ef6\u6062\u590d\u5230\u6700\u65b0\u7248\u672c\uff1a<\/p>\n<pre><code>$ git checkout -- test.txt<\/code><\/pre>\n<p><code>git checkout<\/code>\u5176\u5b9e\u662f\u7528\u7248\u672c\u5e93\u91cc\u7684\u7248\u672c\u66ff\u6362\u5de5\u4f5c\u533a\u7684\u7248\u672c\uff0c\u65e0\u8bba\u5de5\u4f5c\u533a\u662f\u4fee\u6539\u8fd8\u662f\u5220\u9664\uff0c\u90fd\u53ef\u4ee5\u201c\u4e00\u952e\u8fd8\u539f\u201d\u3002<\/p>\n<p>\u6ce8\u610f\uff1a\u4ece\u6765\u6ca1\u6709\u88ab\u6dfb\u52a0\u5230\u7248\u672c\u5e93\u5c31\u88ab\u5220\u9664\u7684\u6587\u4ef6\uff0c\u662f\u65e0\u6cd5\u6062\u590d\u7684\uff01<\/p>\n<h3>\u5c0f\u7ed3<\/h3>\n<p>\u547d\u4ee4<code>git rm<\/code>\u7528\u4e8e\u5220\u9664\u4e00\u4e2a\u6587\u4ef6\u3002\u5982\u679c\u4e00\u4e2a\u6587\u4ef6\u5df2\u7ecf\u88ab\u63d0\u4ea4\u5230\u7248\u672c\u5e93\uff0c\u90a3\u4e48\u4f60\u6c38\u8fdc\u4e0d\u7528\u62c5\u5fc3\u8bef\u5220\uff0c\u4f46\u662f\u8981\u5c0f\u5fc3\uff0c\u4f60\u53ea\u80fd\u6062\u590d\u6587\u4ef6\u5230\u6700\u65b0\u7248\u672c\uff0c\u4f60\u4f1a\u4e22\u5931<strong>\u6700\u8fd1\u4e00\u6b21\u63d0\u4ea4\u540e\u4f60\u4fee\u6539\u7684\u5185\u5bb9<\/strong>\u3002<\/p>\n","protected":false},"excerpt":{"rendered":"<p>GIT\u7684\u57fa\u672c\u4f7f\u7528 1\u3001\u521b\u5efa\u4ed3\u5e93\u5e76\u521d\u59cb\u5316 \/\/\u67e5\u770b\u67d0\u4e2a\u547d\u4ee4\u6587\u6863 git help &lt;command&gt; [&hellip;]<\/p>\n","protected":false},"author":3,"featured_media":0,"comment_status":"closed","ping_status":"closed","sticky":false,"template":"","format":"standard","meta":[],"categories":[274,331],"tags":[],"_links":{"self":[{"href":"https:\/\/egonlin.com\/index.php?rest_route=\/wp\/v2\/posts\/4378"}],"collection":[{"href":"https:\/\/egonlin.com\/index.php?rest_route=\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/egonlin.com\/index.php?rest_route=\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/egonlin.com\/index.php?rest_route=\/wp\/v2\/users\/3"}],"replies":[{"embeddable":true,"href":"https:\/\/egonlin.com\/index.php?rest_route=%2Fwp%2Fv2%2Fcomments&post=4378"}],"version-history":[{"count":0,"href":"https:\/\/egonlin.com\/index.php?rest_route=\/wp\/v2\/posts\/4378\/revisions"}],"wp:attachment":[{"href":"https:\/\/egonlin.com\/index.php?rest_route=%2Fwp%2Fv2%2Fmedia&parent=4378"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/egonlin.com\/index.php?rest_route=%2Fwp%2Fv2%2Fcategories&post=4378"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/egonlin.com\/index.php?rest_route=%2Fwp%2Fv2%2Ftags&post=4378"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}