{"id":2880,"date":"2017-11-29T21:01:42","date_gmt":"2017-11-29T13:01:42","guid":{"rendered":"http:\/\/cn.hostease.com\/xueyuan\/?p=2880"},"modified":"2017-11-29T21:01:42","modified_gmt":"2017-11-29T13:01:42","slug":"git%e7%9a%844%e4%b8%aa%e9%98%b6%e6%ae%b5%e7%9a%84%e6%92%a4%e9%94%80%e6%9b%b4%e6%94%b9","status":"publish","type":"post","link":"https:\/\/cn.hostease.com\/xueyuan\/uncategorized\/git%e7%9a%844%e4%b8%aa%e9%98%b6%e6%ae%b5%e7%9a%84%e6%92%a4%e9%94%80%e6%9b%b4%e6%94%b9\/","title":{"rendered":"Git\u76844\u4e2a\u9636\u6bb5\u7684\u64a4\u9500\u66f4\u6539"},"content":{"rendered":"<p>\u867d\u7136\u00a0<code>git<\/code>\u00a0\u8bde\u751f\u8ddd\u4eca\u5df2\u6709\u00a0<code>12<\/code>\u00a0\u5e74\u4e4b\u4e45\uff0c\u7f51\u4e0a\u5404\u79cd\u5173\u4e8e\u00a0<code>git<\/code>\u00a0\u7684\u4ecb\u7ecd\u6587\u7ae0\u6570\u4e0d\u80dc\u6570\uff0c\u4f46\u662f\u4f9d\u7136\u6709\u5f88\u591a\u4eba\uff08\u5305\u62ec\u6211\u81ea\u5df1\u5728\u5185\uff09\u5bf9\u4e8e\u5b83\u7684\u529f\u80fd\u4e0d\u80fd\u5b8c\u5168\u638c\u63e1\u3002\u4ee5\u4e0b\u7684\u4ecb\u7ecd\u53ea\u662f\u57fa\u4e8e\u6211\u4e2a\u4eba\u5bf9\u4e8e\u00a0<code>git<\/code>\u00a0\u7684\u7406\u89e3\uff0c\u5e76\u4e14\u53ef\u80fd\u751f\u7f16\u786c\u9020\u4e86\u4e00\u4e9b\u4e0d\u5b8c\u5168\u7b26\u5408\u00a0<code>git<\/code>\u00a0\u8bf4\u6cd5\u7684\u8bcd\u8bed\u3002\u76ee\u7684\u53ea\u662f\u4e3a\u4e86\u8ba9\u00a0<code>git<\/code>\u00a0\u901a\u4fd7\u5316\uff0c\u4f7f\u521d\u5b66\u8005\u4e5f\u80fd\u5927\u6982\u4e86\u89e3\u5982\u4f55\u5feb\u901f\u4e0a\u624b\u00a0<code>git<\/code>\u00a0\u3002\u540c\u65f6\uff0c\u4e0b\u9762\u6240\u6709\u8ba8\u8bba\uff0c\u6211\u4eec\u90fd\u5047\u8bbe\u53ea\u4f7f\u7528\u4e00\u4e2a\u5206\u652f\uff0c\u4e5f\u5c31\u662f\u4e3b\u5206\u652f\u00a0<code>master<\/code>\u00a0\u7684\u60c5\u51b5\uff0c\u867d\u7136\u8fd9\u79cd\u4f5c\u6cd5\u5e76\u4e0d\u7b26\u5408\u00a0<code>git<\/code>\u00a0\u89c4\u8303\uff0c\u4f46\u662f\u73b0\u5b9e\u60c5\u51b5\u4e2d\u7edd\u5927\u90e8\u5206\u7528\u6237\u662f\u76f4\u63a5\u5728\u00a0<code>master<\/code>\u5206\u652f\u4e0a\u8fdb\u884c\u5de5\u4f5c\u7684\uff0c\u6240\u4ee5\u5728\u8fd9\u91cc\u6211\u4eec\u4e0d\u53bb\u5f15\u5165\u66f4\u52a0\u590d\u6742\u7684\u5404\u79cd\u5206\u652f\u7684\u60c5\u51b5\uff0c\u4e5f\u4e0d\u6d89\u53ca\u6807\u7b7e\u00a0<code>tag<\/code>\u00a0\u7684\u64cd\u4f5c\uff0c\u53ea\u8bb2\u5728\u6700\u7b80\u5355\u7684\u4e3b\u5206\u652f\u4e0a\u5982\u4f55\u56de\u9000\u3002<\/p>\n<h3>\u57fa\u672c\u6982\u5ff5<\/h3>\n<h3>3\u4e2a\u6b65\u9aa4<\/h3>\n<p><img decoding=\"async\" class=\"aligncenter lazy\" title=\"\u56fe0\uff1aGit\u76844\u4e2a\u9636\u6bb5\u7684\u64a4\u9500\u66f4\u6539\" src=\"https:\/\/www.linuxidc.com\/upload\/2017_11\/171119083731972.gif\" alt=\"\u56fe0\uff1aGit\u76844\u4e2a\u9636\u6bb5\u7684\u64a4\u9500\u66f4\u6539\" data-width=\"550\" data-height=\"103\" data-original=\"upload\/2017_11\/171119083731972.gif\" \/><\/p>\n<p>\u6b63\u5e38\u60c5\u51b5\u4e0b\uff0c\u6211\u4eec\u7684\u5de5\u4f5c\u6d41\u5c31\u662f\u00a0<code>3<\/code>\u00a0\u4e2a\u6b65\u9aa4\uff0c\u5bf9\u5e94\u4e0a\u56fe\u4e2d\u7684\u00a0<code>3<\/code>\u00a0\u4e2a\u7bad\u5934\u7ebf\uff1a<\/p>\n<pre class=\" hljs dockerfile  language-shell\"><span class=\"token function\">git<\/span> add <span class=\"token keyword\">.<\/span>\r\n<span class=\"token function\">git<\/span> commit -m <span class=\"token string\">\"comment\"<\/span>\r\n<span class=\"token function\">git<\/span> push<\/pre>\n<ol>\n<li><code>git add .<\/code>\u00a0\u628a\u6240\u6709\u6587\u4ef6\u653e\u5165\u00a0<code>\u6682\u5b58\u533a<\/code>\u00a0\uff1b<\/li>\n<li><code>git commit<\/code>\u00a0\u628a\u6240\u6709\u6587\u4ef6\u4ece\u00a0<code>\u6682\u5b58\u533a<\/code>\u00a0\u63d0\u4ea4\u8fdb\u00a0<code>\u672c\u5730\u4ed3\u5e93<\/code>\u00a0\uff1b<\/li>\n<li><code>git push<\/code>\u00a0\u628a\u6240\u6709\u6587\u4ef6\u4ece\u00a0<code>\u672c\u5730\u4ed3\u5e93<\/code>\u00a0\u63a8\u9001\u8fdb\u00a0<code>\u8fdc\u7a0b\u4ed3\u5e93<\/code>\u00a0\u3002<\/li>\n<\/ol>\n<h3>4\u4e2a\u533a<\/h3>\n<p><code>git<\/code>\u00a0\u4e4b\u6240\u4ee5\u4ee4\u4eba\u8d39\u89e3\uff0c\u4e3b\u8981\u662f\u5b83\u76f8\u6bd4\u4e8e\u00a0<code>svn<\/code>\u00a0\u7b49\u7b49\u4f20\u7edf\u7684\u7248\u672c\u7ba1\u7406\u5de5\u5177\uff0c\u591a\u5f15\u5165\u4e86\u4e00\u4e2a\u00a0<strong>\u6682\u5b58\u533a<\/strong>\u00a0(\u00a0<code>Stage<\/code>\u00a0)\u7684\u6982\u5ff5\uff0c\u5c31\u56e0\u4e3a\u591a\u4e86\u8fd9\u4e00\u4e2a\u6982\u5ff5\uff0c\u800c\u4f7f\u5f88\u591a\u4eba\u7591\u60d1\u3002\u5176\u5b9e\uff0c\u5728\u521d\u5b66\u8005\u6765\u8bf4\uff0c\u6bcf\u4e2a\u533a\u5177\u4f53\u600e\u4e48\u5de5\u4f5c\u7684\uff0c\u6211\u4eec\u5b8c\u5168\u4e0d\u9700\u8981\u5173\u5fc3\uff0c\u800c\u53ea\u8981\u77e5\u9053\u6709\u8fd9\u4e48\u00a0<code>4<\/code>\u4e2a\u533a\u5c31\u591f\u4e86\uff1a<\/p>\n<ul>\n<li>\u5de5\u4f5c\u533a(\u00a0<code>Working Area<\/code>\u00a0)<\/li>\n<li>\u6682\u5b58\u533a(\u00a0<code>Stage<\/code>\u00a0)<\/li>\n<li>\u672c\u5730\u4ed3\u5e93(\u00a0<code>Local Repository<\/code>\u00a0)<\/li>\n<li>\u8fdc\u7a0b\u4ed3\u5e93(\u00a0<code>Remote Repository<\/code>\u00a0)<\/li>\n<\/ul>\n<h3>5\u79cd\u72b6\u6001<\/h3>\n<p>\u4ee5\u4e0a\u00a0<code>4<\/code>\u00a0\u4e2a\u533a\uff0c\u8fdb\u5165\u6bcf\u4e00\u4e2a\u533a\u6210\u529f\u4e4b\u540e\u4f1a\u4ea7\u751f\u4e00\u4e2a\u72b6\u6001\uff0c\u518d\u52a0\u4e0a\u6700\u521d\u59cb\u7684\u4e00\u4e2a\u72b6\u6001\uff0c\u4e00\u5171\u662f\u00a0<code>5<\/code>\u00a0\u79cd\u72b6\u6001\u3002\u4ee5\u4e0b\u6211\u4eec\u628a\u8fd9\u00a0<code>5<\/code>\u00a0\u79cd\u72b6\u6001\u5206\u522b\u547d\u540d\u4e3a\uff1a<\/p>\n<ul>\n<li>\u672a\u4fee\u6539(\u00a0<code>Origin<\/code>\u00a0)<\/li>\n<li>\u5df2\u4fee\u6539(\u00a0<code>Modified<\/code>\u00a0)<\/li>\n<li>\u5df2\u6682\u5b58(\u00a0<code>Staged<\/code>\u00a0)<\/li>\n<li>\u5df2\u63d0\u4ea4(\u00a0<code>Committed<\/code>\u00a0)<\/li>\n<li>\u5df2\u63a8\u9001(\u00a0<code>Pushed<\/code>\u00a0)<\/li>\n<\/ul>\n<h3>\u68c0\u67e5\u4fee\u6539<\/h3>\n<p>\u4e86\u89e3\u4e86\u57fa\u672c\u6982\u5ff5\u4e4b\u540e\uff0c\u6211\u4eec\u6765\u8c08\u4e00\u8c08\u72af\u9519\u8bef\u4e4b\u540e\u5982\u4f55\u64a4\u9500\u7684\u95ee\u9898\u3002\u9996\u5148\uff0c\u6211\u4eec\u8981\u4e86\u89e3\u5982\u4f55\u68c0\u67e5\u8fd9\u00a0<code>3<\/code>\u00a0\u4e2a\u6b65\u9aa4\u5f53\u4e2d\u6bcf\u4e00\u4e2a\u6b65\u9aa4\u4fee\u6539\u4e86\u4ec0\u4e48\uff0c\u7136\u540e\u624d\u597d\u5224\u65ad\u6709\u6ca1\u6709\u4fee\u6539\u6210\u529f\u3002\u68c0\u67e5\u4fee\u6539\u7684\u4e8c\u7ea7\u547d\u4ee4\u90fd\u76f8\u540c\uff0c\u90fd\u662f\u00a0<code>diff<\/code>\u00a0\uff0c\u53ea\u662f\u53c2\u6570\u6709\u6240\u4e0d\u540c\u3002<\/p>\n<h3>\u5df2\u4fee\u6539\uff0c\u672a\u6682\u5b58<\/h3>\n<pre class=\" hljs nginx  language-shell\"><span class=\"token function\">git<\/span> <span class=\"token function\">diff<\/span><\/pre>\n<p>\u9996\u5148\uff0c\u6211\u4eec\u6765\u770b\u4e00\u4e0b\uff0c\u5982\u679c\u6211\u4eec\u53ea\u662f\u7b80\u5355\u5730\u5728\u6d4f\u89c8\u5668\u91cc\u4fdd\u5b58\u4e86\u4e00\u4e0b\u6587\u4ef6\uff0c\u4f46\u662f\u8fd8\u6ca1\u6709\u505a\u00a0<code>git add .<\/code>\u00a0\u4e4b\u524d\uff0c\u6211\u4eec\u5982\u4f55\u68c0\u67e5\u6709\u54ea\u4e9b\u4fee\u6539\u3002\u6211\u4eec\u5148\u968f\u4fbf\u62ff\u4e00\u4e2a\u6587\u4ef6\u6765\u505a\u4e00\u4e0b\u5b9e\u9a8c\uff1a<\/p>\n<p><img decoding=\"async\" class=\"aligncenter lazy\" title=\"\u56fe1\uff1aGit\u76844\u4e2a\u9636\u6bb5\u7684\u64a4\u9500\u66f4\u6539\" src=\"https:\/\/www.linuxidc.com\/upload\/2017_11\/171119083731975.gif\" alt=\"\u56fe1\uff1aGit\u76844\u4e2a\u9636\u6bb5\u7684\u64a4\u9500\u66f4\u6539\" data-width=\"550\" data-height=\"283\" data-original=\"upload\/2017_11\/171119083731975.gif\" \/><\/p>\n<p>\u6211\u4eec\u5728\u6587\u4ef6\u5f00\u5934\u7684\u7b2c\u00a0<code>2<\/code>\u00a0\u884c\u80e1\u4e71\u52a0\u4e86\u00a0<code>4<\/code>\u00a0\u4e2a\u6570\u5b57\u00a0<code>1234<\/code>\u00a0\uff0c\u5b58\u76d8\uff0c\u8fd9\u65f6\u6587\u4ef6\u8fdb\u5165\u4e86\u00a0<code>\u5df2\u4fee\u6539<\/code>\u00a0\u72b6\u6001\uff0c\u4f46\u662f\u8fd8\u6ca1\u6709\u8fdb\u5165\u00a0<code>\u6682\u5b58\u533a<\/code>\u00a0\uff0c\u6211\u4eec\u8fd0\u884c\u00a0<code>git diff<\/code>\u00a0\uff0c\u7ed3\u679c\u5982\u4e0b\uff1a<\/p>\n<pre class=\" prettyprint hljs diff  language-shell\"><span class=\"token function\">diff<\/span> --git a\/index.md b\/index.md\r\nindex 73ff1ba<span class=\"token punctuation\">..<\/span>1066758 100644\r\n--- a\/index.md\r\n+++ b\/index.md\r\n@@ -1,5 +1,5 @@\r\n ---\r\n-layout: main\r\n+1234layout: main\r\n color: black\r\n ---<\/pre>\n<p><code>git diff<\/code>\u00a0\u7684\u7ed3\u679c\u544a\u8bc9\u6211\u4eec\u54ea\u4e9b\u6587\u4ef6\u5df2\u7ecf\u505a\u4e86\u54ea\u4e9b\u4fee\u6539\u3002<\/p>\n<h3>\u5df2\u6682\u5b58\uff0c\u672a\u63d0\u4ea4<\/h3>\n<pre class=\" hljs lua  language-shell\"><span class=\"token function\">git<\/span> <span class=\"token function\">diff<\/span> --cached<\/pre>\n<p>\u73b0\u5728\u6211\u4eec\u628a\u4fee\u6539\u653e\u5165\u00a0<code>\u6682\u5b58\u533a<\/code>\u00a0\u770b\u4e00\u4e0b\u3002\u5148\u6267\u884c\u00a0<code>git add .<\/code>\u00a0\uff0c\u7136\u540e\u6267\u884c\u00a0<code>git diff<\/code>\u00a0\uff0c\u4f60\u4f1a\u53d1\u73b0\u6ca1\u6709\u4efb\u4f55\u7ed3\u679c\uff1a<\/p>\n<p><img decoding=\"async\" class=\"aligncenter lazy\" title=\"\u56fe2\uff1aGit\u76844\u4e2a\u9636\u6bb5\u7684\u64a4\u9500\u66f4\u6539\" src=\"https:\/\/www.linuxidc.com\/upload\/2017_11\/171119083731974.gif\" alt=\"\u56fe2\uff1aGit\u76844\u4e2a\u9636\u6bb5\u7684\u64a4\u9500\u66f4\u6539\" data-width=\"376\" data-height=\"63\" data-original=\"upload\/2017_11\/171119083731974.gif\" \/><\/p>\n<p>\u8fd9\u8bf4\u660e\u00a0<code>git diff<\/code>\u00a0\u8fd9\u4e2a\u547d\u4ee4\u53ea\u68c0\u67e5\u6211\u4eec\u7684\u00a0<code>\u5de5\u4f5c\u533a<\/code>\u00a0\u548c\u00a0<code>\u6682\u5b58\u533a<\/code>\u00a0\u4e4b\u95f4\u7684\u5dee\u5f02\uff0c\u5982\u679c\u6211\u4eec\u60f3\u770b\u5230\u00a0<code>\u6682\u5b58\u533a<\/code>\u00a0\u548c\u00a0<code>\u672c\u5730\u4ed3\u5e93<\/code>\u00a0\u4e4b\u95f4\u7684\u5dee\u5f02\uff0c\u5c31\u9700\u8981\u52a0\u4e00\u4e2a\u53c2\u6570\u00a0<code>git diff --cached<\/code>\u00a0\uff1a<\/p>\n<pre class=\" prettyprint hljs diff  language-shell\"><span class=\"token function\">diff<\/span> --git a\/index.md b\/index.md\r\nindex 73ff1ba<span class=\"token punctuation\">..<\/span>1066758 100644\r\n--- a\/index.md\r\n+++ b\/index.md\r\n@@ -1,5 +1,5 @@\r\n ---\r\n-layout: main\r\n+1234layout: main\r\n color: black\r\n ---<\/pre>\n<p>\u8fd9\u65f6\u5019\u6211\u4eec\u770b\u5230\u7684\u5dee\u5f02\u662f\u00a0<code>\u6682\u5b58\u533a<\/code>\u00a0\u548c\u00a0<code>\u672c\u5730\u4ed3\u5e93<\/code>\u00a0\u4e4b\u95f4\u7684\u5dee\u5f02\u3002<\/p>\n<h3>\u5df2\u63d0\u4ea4\uff0c\u672a\u63a8\u9001<\/h3>\n<pre class=\" hljs nginx  language-shell\"><span class=\"token function\">git<\/span> <span class=\"token function\">diff<\/span> master origin\/master<\/pre>\n<p>\u73b0\u5728\uff0c\u6211\u4eec\u628a\u4fee\u6539\u4ece\u00a0<code>\u6682\u5b58\u533a<\/code>\u00a0\u63d0\u4ea4\u5230\u00a0<code>\u672c\u5730\u4ed3\u5e93<\/code>\u00a0\uff0c\u518d\u770b\u4e00\u4e0b\u5dee\u5f02\u3002\u5148\u6267\u884c\u00a0<code>git commit<\/code>\u00a0\uff0c\u7136\u540e\u518d\u6267\u884c\u00a0<code>git diff --cached<\/code>\u00a0\uff0c\u6ca1\u6709\u5dee\u5f02\uff0c\u6267\u884c\u00a0<code>git diff master origin\/master<\/code>\u00a0\uff0c\u53ef\u4ee5\u770b\u5230\u5dee\u5f02\uff1a<\/p>\n<p><img decoding=\"async\" class=\"aligncenter lazy\" title=\"\u56fe3\uff1aGit\u76844\u4e2a\u9636\u6bb5\u7684\u64a4\u9500\u66f4\u6539\" src=\"https:\/\/www.linuxidc.com\/upload\/2017_11\/171119083731976.gif\" alt=\"\u56fe3\uff1aGit\u76844\u4e2a\u9636\u6bb5\u7684\u64a4\u9500\u66f4\u6539\" data-width=\"527\" data-height=\"258\" data-original=\"upload\/2017_11\/171119083731976.gif\" \/><\/p>\n<p>\u5728\u8fd9\u91cc\uff0c\u00a0<code>master<\/code>\u00a0\u5c31\u662f\u4f60\u7684\u00a0<code>\u672c\u5730\u4ed3\u5e93<\/code>\u00a0\uff0c\u800c\u00a0<code>origin\/master<\/code>\u00a0\u5c31\u662f\u4f60\u7684\u00a0<code>\u8fdc\u7a0b\u4ed3\u5e93<\/code>\u00a0\uff0c\u00a0<code>master<\/code>\u00a0\u662f\u4e3b\u5206\u652f\u7684\u610f\u601d\uff0c\u56e0\u4e3a\u6211\u4eec\u90fd\u5728\u4e3b\u5206\u652f\u4e0a\u5de5\u4f5c\uff0c\u6240\u4ee5\u8fd9\u91cc\u4e24\u8fb9\u90fd\u662f\u00a0<code>master<\/code>\u00a0\uff0c\u800c\u00a0<code>origin<\/code>\u00a0\u5c31\u4ee3\u8868\u8fdc\u7a0b\u3002<\/p>\n<h3>\u64a4\u9500\u4fee\u6539<\/h3>\n<p>\u4e86\u89e3\u6e05\u695a\u5982\u4f55\u68c0\u67e5\u5404\u79cd\u4fee\u6539\u4e4b\u540e\uff0c\u6211\u4eec\u5f00\u59cb\u5c1d\u8bd5\u5404\u79cd\u64a4\u9500\u64cd\u4f5c\u3002<\/p>\n<h3>\u5df2\u4fee\u6539\uff0c\u672a\u6682\u5b58<\/h3>\n<p>\u5982\u679c\u6211\u4eec\u53ea\u662f\u5728\u7f16\u8f91\u5668\u91cc\u4fee\u6539\u4e86\u6587\u4ef6\uff0c\u4f46\u8fd8\u6ca1\u6709\u6267\u884c\u00a0<code>git add .<\/code>\u00a0\uff0c\u8fd9\u65f6\u5019\u6211\u4eec\u7684\u6587\u4ef6\u8fd8\u5728\u00a0<code>\u5de5\u4f5c\u533a<\/code>\u00a0\uff0c\u5e76\u6ca1\u6709\u8fdb\u5165\u00a0<code>\u6682\u5b58\u533a<\/code>\u00a0\uff0c\u6211\u4eec\u53ef\u4ee5\u7528\uff1a<\/p>\n<pre class=\" hljs nginx  language-shell\"><span class=\"token function\">git<\/span> checkout <span class=\"token keyword\">.<\/span><\/pre>\n<p>\u6216\u8005<\/p>\n<pre class=\" hljs sql  language-shell\"><span class=\"token function\">git<\/span> reset --hard<\/pre>\n<p>\u6765\u8fdb\u884c\u64a4\u9500\u64cd\u4f5c\u3002<\/p>\n<p><img decoding=\"async\" class=\"aligncenter lazy\" title=\"\u56fe4\uff1aGit\u76844\u4e2a\u9636\u6bb5\u7684\u64a4\u9500\u66f4\u6539\" src=\"https:\/\/www.linuxidc.com\/upload\/2017_11\/171119083731973.gif\" alt=\"\u56fe4\uff1aGit\u76844\u4e2a\u9636\u6bb5\u7684\u64a4\u9500\u66f4\u6539\" data-width=\"441\" data-height=\"257\" data-original=\"upload\/2017_11\/171119083731973.gif\" \/><\/p>\n<p>\u53ef\u4ee5\u770b\u5230\uff0c\u5728\u6267\u884c\u5b8c\u00a0<code>git checkout .<\/code>\u00a0\u4e4b\u540e\uff0c\u4fee\u6539\u5df2\u88ab\u64a4\u9500\uff0c\u00a0<code>git diff<\/code>\u00a0\u6ca1\u6709\u4efb\u4f55\u5185\u5bb9\u4e86\u3002<\/p>\n<p>\u4e00\u5bf9\u53cd\u4e49\u8bcd<\/p>\n<p><code>git add .<\/code>\u00a0\u7684\u53cd\u4e49\u8bcd\u662f\u00a0<code>git checkout .<\/code>\u00a0\u3002\u505a\u5b8c\u4fee\u6539\u4e4b\u540e\uff0c\u5982\u679c\u4f60\u60f3\u5411\u524d\u8d70\u4e00\u6b65\uff0c\u8ba9\u4fee\u6539\u8fdb\u5165\u00a0<code>\u6682\u5b58\u533a<\/code>\u00a0\uff0c\u5c31\u6267\u884c\u00a0<code>git add .<\/code>\uff0c\u5982\u679c\u4f60\u60f3\u5411\u540e\u9000\u4e00\u6b65\uff0c\u64a4\u9500\u521a\u624d\u7684\u4fee\u6539\uff0c\u5c31\u6267\u884c\u00a0<code>git checkout .<\/code>\u00a0\u3002<\/p>\n<h3>\u5df2\u6682\u5b58\uff0c\u672a\u63d0\u4ea4<\/h3>\n<p>\u4f60\u5df2\u7ecf\u6267\u884c\u4e86\u00a0<code>git add .<\/code>\u00a0\uff0c\u4f46\u8fd8\u6ca1\u6709\u6267\u884c\u00a0<code>git commit -m \"comment\"<\/code>\u00a0\u3002\u8fd9\u65f6\u5019\u4f60\u610f\u8bc6\u5230\u4e86\u9519\u8bef\uff0c\u60f3\u8981\u64a4\u9500\uff0c\u4f60\u53ef\u4ee5\u6267\u884c\uff1a<\/p>\n<pre class=\" hljs nginx  language-shell\"><span class=\"token function\">git<\/span> reset\r\n<span class=\"token function\">git<\/span> checkout <span class=\"token keyword\">.<\/span><\/pre>\n<p>\u6216\u8005<\/p>\n<pre class=\" hljs sql  language-shell\"><span class=\"token function\">git<\/span> reset --hard<\/pre>\n<p><code>git reset<\/code>\u00a0\u53ea\u662f\u628a\u4fee\u6539\u9000\u56de\u5230\u4e86\u00a0<code>git add .<\/code>\u00a0\u4e4b\u524d\u7684\u72b6\u6001\uff0c\u4e5f\u5c31\u662f\u8bf4\u6587\u4ef6\u672c\u8eab\u8fd8\u5904\u4e8e\u00a0<code>\u5df2\u4fee\u6539\u672a\u6682\u5b58<\/code>\u00a0\u72b6\u6001\uff0c\u4f60\u5982\u679c\u60f3\u9000\u56de\u00a0<code>\u672a\u4fee\u6539<\/code>\u00a0\u72b6\u6001\uff0c\u8fd8\u9700\u8981\u6267\u884c\u00a0<code>git checkout .<\/code>\u00a0\u3002<\/p>\n<p>\u6216\u8bb8\u4f60\u5df2\u7ecf\u6ce8\u610f\u5230\u4e86\uff0c\u4ee5\u4e0a\u4e24\u4e2a\u6b65\u9aa4\u90fd\u53ef\u4ee5\u7528\u540c\u4e00\u4e2a\u547d\u4ee4\u00a0<code>git reset --hard<\/code>\u00a0\u6765\u5b8c\u6210\u3002\u662f\u7684\uff0c\u5c31\u662f\u8fd9\u4e2a\u5f3a\u5927\u7684\u547d\u4ee4\uff0c\u53ef\u4ee5\u4e00\u6b65\u5230\u4f4d\u5730\u628a\u4f60\u7684\u4fee\u6539\u5b8c\u5168\u6062\u590d\u5230\u00a0<code>\u672a\u4fee\u6539<\/code>\u00a0\u7684\u72b6\u6001\u3002<\/p>\n<h3>\u5df2\u63d0\u4ea4\uff0c\u672a\u63a8\u9001<\/h3>\n<p>\u4f60\u7684\u624b\u592a\u5feb\uff0c\u4f60\u65e2\u6267\u884c\u4e86\u00a0<code>git add .<\/code>\u00a0\uff0c\u53c8\u6267\u884c\u4e86\u00a0<code>git commit<\/code>\u00a0\uff0c\u8fd9\u65f6\u5019\u4f60\u7684\u4ee3\u7801\u5df2\u7ecf\u8fdb\u5165\u4e86\u4f60\u7684\u00a0<code>\u672c\u5730\u4ed3\u5e93<\/code>\u00a0\uff0c\u7136\u800c\u4f60\u540e\u6094\u4e86\uff0c\u600e\u4e48\u529e\uff1f\u4e0d\u8981\u7740\u6025\uff0c\u8fd8\u6709\u529e\u6cd5\u3002<\/p>\n<pre class=\" hljs sql  language-shell\"><span class=\"token function\">git<\/span> reset --hard origin\/master<\/pre>\n<p>\u8fd8\u662f\u8fd9\u4e2a\u00a0<code>git reset --hard<\/code>\u00a0\u547d\u4ee4\uff0c\u53ea\u4e0d\u8fc7\u8fd9\u6b21\u591a\u4e86\u4e00\u4e2a\u53c2\u6570\u00a0<code>origin\/master<\/code>\u00a0\uff0c\u6b63\u5982\u6211\u4eec\u4e0a\u9762\u8bb2\u8fc7\u7684\uff0c\u00a0<code>origin\/master<\/code>\u00a0\u4ee3\u8868\u00a0<code>\u8fdc\u7a0b\u4ed3\u5e93<\/code>\u00a0\uff0c\u65e2\u7136\u4f60\u5df2\u7ecf\u6c61\u67d3\u4e86\u4f60\u7684\u00a0<code>\u672c\u5730\u4ed3\u5e93<\/code>\u00a0\uff0c\u90a3\u4e48\u5c31\u4ece\u00a0<code>\u8fdc\u7a0b\u4ed3\u5e93<\/code>\u00a0\u628a\u4ee3\u7801\u53d6\u56de\u6765\u5427\u3002<\/p>\n<h3>\u5df2\u63a8\u9001<\/h3>\n<p>\u5f88\u4e0d\u5e78\uff0c\u4f60\u7684\u624b\u5b9e\u5728\u662f\u592a\u5feb\u4e86\uff0c\u4f60\u65e2\u00a0<code>git add<\/code>\u00a0\u4e86\uff0c\u53c8\u00a0<code>git commit<\/code>\u00a0\u4e86\uff0c\u5e76\u4e14\u8fd8\u00a0<code>git push<\/code>\u00a0\u4e86\uff0c\u8fd9\u65f6\u4f60\u7684\u4ee3\u7801\u5df2\u7ecf\u8fdb\u5165\u00a0<code>\u8fdc\u7a0b\u4ed3\u5e93<\/code>\u00a0\u3002\u5982\u679c\u4f60\u60f3\u6062\u590d\u7684\u8bdd\uff0c\u8fd8\u597d\uff0c\u7531\u4e8e\u4f60\u7684\u00a0<code>\u672c\u5730\u4ed3\u5e93<\/code>\u00a0\u548c\u00a0<code>\u8fdc\u7a0b\u4ed3\u5e93<\/code>\u00a0\u662f\u7b49\u4ef7\u7684\uff0c\u4f60\u53ea\u9700\u8981\u5148\u6062\u590d\u00a0<code>\u672c\u5730\u4ed3\u5e93<\/code>\u00a0\uff0c\u518d\u5f3a\u5236\u00a0<code>push<\/code>\u00a0\u5230\u00a0<code>\u8fdc\u7a0b\u4ed3\u5e93<\/code>\u00a0\u5c31\u597d\u4e86\uff1a<\/p>\n<pre class=\" hljs sql  language-shell\"><span class=\"token function\">git<\/span> reset --hard HEAD^\r\n<span class=\"token function\">git<\/span> push -f<\/pre>\n<p><img decoding=\"async\" class=\"aligncenter lazy\" title=\"\u56fe5\uff1aGit\u76844\u4e2a\u9636\u6bb5\u7684\u64a4\u9500\u66f4\u6539\" src=\"https:\/\/www.linuxidc.com\/upload\/2017_11\/171119083731971.gif\" alt=\"\u56fe5\uff1aGit\u76844\u4e2a\u9636\u6bb5\u7684\u64a4\u9500\u66f4\u6539\" data-width=\"486\" data-height=\"157\" data-original=\"upload\/2017_11\/171119083731971.gif\" \/><\/p>\n<h3>\u603b\u7ed3<\/h3>\n<p>\u4ee5\u4e0a\u00a0<code>4<\/code>\u00a0\u79cd\u72b6\u6001\u7684\u64a4\u9500\u6211\u4eec\u90fd\u7528\u5230\u4e86\u540c\u4e00\u4e2a\u547d\u4ee4\u00a0<code>git reset --hard<\/code>\u00a0\uff0c\u524d\u00a0<code>2<\/code>\u00a0\u79cd\u72b6\u6001\u7684\u7528\u6cd5\u751a\u81f3\u5b8c\u5168\u4e00\u6837\uff0c\u6240\u4ee5\u53ea\u8981\u638c\u63e1\u4e86\u00a0<code>git reset --hard<\/code>\u00a0\u8fd9\u4e2a\u547d\u4ee4\u7684\u7528\u6cd5\uff0c\u4ece\u6b64\u4f60\u518d\u4e5f\u4e0d\u7528\u62c5\u5fc3\u63d0\u4ea4\u9519\u8bef\u4e86\u3002<\/p>\n","protected":false},"excerpt":{"rendered":"<p>\u867d\u7136\u00a0git\u00a0\u8bde\u751f\u8ddd\u4eca\u5df2\u6709\u00a012\u00a0\u5e74\u4e4b\u4e45\uff0c\u7f51\u4e0a\u5404\u79cd\u5173\u4e8e\u00a0git\u00a0\u7684\u4ecb\u7ecd\u6587\u7ae0\u6570\u4e0d\u80dc\u6570\uff0c\u4f46\u662f\u4f9d\u7136\u6709\u5f88\u591a\u4eba\uff08\u5305\u62ec\u6211\u81ea &#8230; <a title=\"Git\u76844\u4e2a\u9636\u6bb5\u7684\u64a4\u9500\u66f4\u6539\" class=\"read-more\" href=\"https:\/\/cn.hostease.com\/xueyuan\/uncategorized\/git%e7%9a%844%e4%b8%aa%e9%98%b6%e6%ae%b5%e7%9a%84%e6%92%a4%e9%94%80%e6%9b%b4%e6%94%b9\/\" aria-label=\"\u9605\u8bfb Git\u76844\u4e2a\u9636\u6bb5\u7684\u64a4\u9500\u66f4\u6539\">\u9605\u8bfb\u66f4\u591a<\/a><\/p>\n","protected":false},"author":1,"featured_media":0,"comment_status":"closed","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"_jetpack_memberships_contains_paid_content":false,"footnotes":""},"categories":[1],"tags":[793],"class_list":["post-2880","post","type-post","status-publish","format-standard","hentry","category-uncategorized","tag-git"],"aioseo_notices":[],"jetpack_featured_media_url":"","jetpack-related-posts":[],"jetpack_sharing_enabled":true,"_links":{"self":[{"href":"https:\/\/cn.hostease.com\/xueyuan\/wp-json\/wp\/v2\/posts\/2880","targetHints":{"allow":["GET"]}}],"collection":[{"href":"https:\/\/cn.hostease.com\/xueyuan\/wp-json\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/cn.hostease.com\/xueyuan\/wp-json\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/cn.hostease.com\/xueyuan\/wp-json\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"https:\/\/cn.hostease.com\/xueyuan\/wp-json\/wp\/v2\/comments?post=2880"}],"version-history":[{"count":1,"href":"https:\/\/cn.hostease.com\/xueyuan\/wp-json\/wp\/v2\/posts\/2880\/revisions"}],"predecessor-version":[{"id":2881,"href":"https:\/\/cn.hostease.com\/xueyuan\/wp-json\/wp\/v2\/posts\/2880\/revisions\/2881"}],"wp:attachment":[{"href":"https:\/\/cn.hostease.com\/xueyuan\/wp-json\/wp\/v2\/media?parent=2880"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/cn.hostease.com\/xueyuan\/wp-json\/wp\/v2\/categories?post=2880"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/cn.hostease.com\/xueyuan\/wp-json\/wp\/v2\/tags?post=2880"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}