{"id":601,"date":"2018-02-23T23:48:54","date_gmt":"2018-02-23T15:48:54","guid":{"rendered":"http:\/\/60.205.208.74\/2018\/02\/23\/git-%e5%b7%a5%e4%bd%9c%e5%8c%ba%e3%80%81%e6%9a%82%e5%ad%98%e5%8c%ba%e5%92%8c%e7%89%88%e6%9c%ac%e5%ba%93\/"},"modified":"2018-02-23T23:48:54","modified_gmt":"2018-02-23T15:48:54","slug":"git-%e5%b7%a5%e4%bd%9c%e5%8c%ba%e3%80%81%e6%9a%82%e5%ad%98%e5%8c%ba%e5%92%8c%e7%89%88%e6%9c%ac%e5%ba%93","status":"publish","type":"post","link":"https:\/\/www.puzi7.net\/?p=601","title":{"rendered":"Git \u5de5\u4f5c\u533a\u3001\u6682\u5b58\u533a\u548c\u7248\u672c\u5e93"},"content":{"rendered":"<span itemprop=\"description\"><div class=\"article-body\">\n<div class=\"article-intro\" id=\"content\">\n<h1>Git \u5de5\u4f5c\u533a\u3001\u6682\u5b58\u533a\u548c\u7248\u672c\u5e93<\/h1>\n<hr>\n<h2>\u57fa\u672c\u6982\u5ff5<\/h2>\n<p>\n\u6211\u4eec\u5148\u6765\u7406\u89e3\u4e0bGit \u5de5\u4f5c\u533a\u3001\u6682\u5b58\u533a\u548c\u7248\u672c\u5e93\u6982\u5ff5<\/p>\n<ul>\n<li><strong>\u5de5\u4f5c\u533a\uff1a<\/strong>\u5c31\u662f\u4f60\u5728\u7535\u8111\u91cc\u80fd\u770b\u5230\u7684\u76ee\u5f55\u3002<\/li>\n<li><strong>\u6682\u5b58\u533a\uff1a<\/strong>\u82f1\u6587\u53ebstage, \u6216index\u3002\u4e00\u822c\u5b58\u653e\u5728 &#8220;.git\u76ee\u5f55\u4e0b&#8221; \u4e0b\u7684index\u6587\u4ef6\uff08.git\/index\uff09\u4e2d\uff0c\u6240\u4ee5\u6211\u4eec\u628a\u6682\u5b58\u533a\u6709\u65f6\u4e5f\u53eb\u4f5c\u7d22\u5f15\uff08index\uff09\u3002<\/li>\n<li><strong>\u7248\u672c\u5e93\uff1a<\/strong>\u5de5\u4f5c\u533a\u6709\u4e00\u4e2a\u9690\u85cf\u76ee\u5f55.git\uff0c\u8fd9\u4e2a\u4e0d\u7b97\u5de5\u4f5c\u533a\uff0c\u800c\u662fGit\u7684\u7248\u672c\u5e93\u3002<\/li>\n<\/ul>\n<p>\n\u4e0b\u9762\u8fd9\u4e2a\u56fe\u5c55\u793a\u4e86\u5de5\u4f5c\u533a\u3001\u7248\u672c\u5e93\u4e2d\u7684\u6682\u5b58\u533a\u548c\u7248\u672c\u5e93\u4e4b\u95f4\u7684\u5173\u7cfb\uff1a<\/p>\n<p><img decoding=\"async\" class=\"attachment-full\" src=\"http:\/\/www.runoob.com\/wp-content\/uploads\/2015\/02\/1352126739_7909.jpg\"><\/p>\n<p>\n\u56fe\u4e2d\u5de6\u4fa7\u4e3a\u5de5\u4f5c\u533a\uff0c\u53f3\u4fa7\u4e3a\u7248\u672c\u5e93\u3002\u5728\u7248\u672c\u5e93\u4e2d\u6807\u8bb0\u4e3a &#8220;index&#8221; \u7684\u533a\u57df\u662f\u6682\u5b58\u533a\uff08stage, index\uff09\uff0c\u6807\u8bb0\u4e3a &#8220;master&#8221; \u7684\u662f master \u5206\u652f\u6240\u4ee3\u8868\u7684\u76ee\u5f55\u6811\u3002\n<\/p>\n<p>\u56fe\u4e2d\u6211\u4eec\u53ef\u4ee5\u770b\u51fa\u6b64\u65f6 &#8220;HEAD&#8221; \u5b9e\u9645\u662f\u6307\u5411 master \u5206\u652f\u7684\u4e00\u4e2a&#8221;\u6e38\u6807&#8221;\u3002\u6240\u4ee5\u56fe\u793a\u7684\u547d\u4ee4\u4e2d\u51fa\u73b0 HEAD \u7684\u5730\u65b9\u53ef\u4ee5\u7528 master \u6765\u66ff\u6362\u3002<\/p>\n<p>\u56fe\u4e2d\u7684 objects \u6807\u8bc6\u7684\u533a\u57df\u4e3a Git \u7684\u5bf9\u8c61\u5e93\uff0c\u5b9e\u9645\u4f4d\u4e8e &#8220;.git\/objects&#8221; \u76ee\u5f55\u4e0b\uff0c\u91cc\u9762\u5305\u542b\u4e86\u521b\u5efa\u7684\u5404\u79cd\u5bf9\u8c61\u53ca\u5185\u5bb9\u3002<\/p>\n<p>\u5f53\u5bf9\u5de5\u4f5c\u533a\u4fee\u6539\uff08\u6216\u65b0\u589e\uff09\u7684\u6587\u4ef6\u6267\u884c &#8220;git add&#8221; \u547d\u4ee4\u65f6\uff0c\u6682\u5b58\u533a\u7684\u76ee\u5f55\u6811\u88ab\u66f4\u65b0\uff0c\u540c\u65f6\u5de5\u4f5c\u533a\u4fee\u6539\uff08\u6216\u65b0\u589e\uff09\u7684\u6587\u4ef6\u5185\u5bb9\u88ab\u5199\u5165\u5230\u5bf9\u8c61\u5e93\u4e2d\u7684\u4e00\u4e2a\u65b0\u7684\u5bf9\u8c61\u4e2d\uff0c\u800c\u8be5\u5bf9\u8c61\u7684ID\u88ab\u8bb0\u5f55\u5728\u6682\u5b58\u533a\u7684\u6587\u4ef6\u7d22\u5f15\u4e2d\u3002<\/p>\n<p>\u5f53\u6267\u884c\u63d0\u4ea4\u64cd\u4f5c\uff08git commit\uff09\u65f6\uff0c\u6682\u5b58\u533a\u7684\u76ee\u5f55\u6811\u5199\u5230\u7248\u672c\u5e93\uff08\u5bf9\u8c61\u5e93\uff09\u4e2d\uff0cmaster \u5206\u652f\u4f1a\u505a\u76f8\u5e94\u7684\u66f4\u65b0\u3002\u5373 master \u6307\u5411\u7684\u76ee\u5f55\u6811\u5c31\u662f\u63d0\u4ea4\u65f6\u6682\u5b58\u533a\u7684\u76ee\u5f55\u6811\u3002<\/p>\n<p>\u5f53\u6267\u884c &#8220;git reset HEAD&#8221; \u547d\u4ee4\u65f6\uff0c\u6682\u5b58\u533a\u7684\u76ee\u5f55\u6811\u4f1a\u88ab\u91cd\u5199\uff0c\u88ab master \u5206\u652f\u6307\u5411\u7684\u76ee\u5f55\u6811\u6240\u66ff\u6362\uff0c\u4f46\u662f\u5de5\u4f5c\u533a\u4e0d\u53d7\u5f71\u54cd\u3002<\/p>\n<p>\u5f53\u6267\u884c &#8220;git rm &#8211;cached &lt;file&gt;&#8221; \u547d\u4ee4\u65f6\uff0c\u4f1a\u76f4\u63a5\u4ece\u6682\u5b58\u533a\u5220\u9664\u6587\u4ef6\uff0c\u5de5\u4f5c\u533a\u5219\u4e0d\u505a\u51fa\u6539\u53d8\u3002<\/p>\n<p>\u5f53\u6267\u884c &#8220;git checkout .&#8221; \u6216\u8005 &#8220;git checkout &#8212; &lt;file&gt;&#8221; \u547d\u4ee4\u65f6\uff0c\u4f1a\u7528\u6682\u5b58\u533a\u5168\u90e8\u6216\u6307\u5b9a\u7684\u6587\u4ef6\u66ff\u6362\u5de5\u4f5c\u533a\u7684\u6587\u4ef6\u3002\u8fd9\u4e2a\u64cd\u4f5c\u5f88\u5371\u9669\uff0c\u4f1a\u6e05\u9664\u5de5\u4f5c\u533a\u4e2d\u672a\u6dfb\u52a0\u5230\u6682\u5b58\u533a\u7684\u6539\u52a8\u3002<\/p>\n<p>\u5f53\u6267\u884c &#8220;git checkout HEAD .&#8221; \u6216\u8005 &#8220;git checkout HEAD &lt;file&gt;&#8221; \u547d\u4ee4\u65f6\uff0c\u4f1a\u7528 HEAD \u6307\u5411\u7684 master \u5206\u652f\u4e2d\u7684\u5168\u90e8\u6216\u8005\u90e8\u5206\u6587\u4ef6\u66ff\u6362\u6682\u5b58\u533a\u548c\u4ee5\u53ca\u5de5\u4f5c\u533a\u4e2d\u7684\u6587\u4ef6\u3002\u8fd9\u4e2a\u547d\u4ee4\u4e5f\u662f\u6781\u5177\u5371\u9669\u6027\u7684\uff0c\u56e0\u4e3a\u4e0d\u4f46\u4f1a\u6e05\u9664\u5de5\u4f5c\u533a\u4e2d\u672a\u63d0\u4ea4\u7684\u6539\u52a8\uff0c\u4e5f\u4f1a\u6e05\u9664\u6682\u5b58\u533a\u4e2d\u672a\u63d0\u4ea4\u7684\u6539\u52a8\u3002\n<\/p>\n<\/p><\/div>\n<\/p><\/div>\n<span>","protected":false},"excerpt":{"rendered":"<p class=\"excerpt\"><span itemprop=\"description\">Git \u5de5\u4f5c\u533a\u3001\u6682\u5b58\u533a\u548c\u7248\u672c\u5e93 \u57fa\u672c\u6982\u5ff5 \u6211\u4eec\u5148\u6765\u7406\u89e3\u4e0bGit \u5de5\u4f5c\u533a\u3001\u6682\u5b58\u533a\u548c\u7248\u672c\u5e93\u6982\u5ff5&hellip;<\/span><\/p>\n<p class=\"more-link-p btn-align-right\"><a class=\"green zoom-btn\" href=\"https:\/\/www.puzi7.net\/?p=601\">Read More<\/a><\/p>\n","protected":false},"author":1,"featured_media":0,"comment_status":"open","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"footnotes":""},"categories":[20],"tags":[64,137],"class_list":["post-601","post","type-post","status-publish","format-standard","hentry","category-git","tag-git","tag-tool","zoom-theme-has-thumb"],"_links":{"self":[{"href":"https:\/\/www.puzi7.net\/index.php?rest_route=\/wp\/v2\/posts\/601","targetHints":{"allow":["GET"]}}],"collection":[{"href":"https:\/\/www.puzi7.net\/index.php?rest_route=\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/www.puzi7.net\/index.php?rest_route=\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/www.puzi7.net\/index.php?rest_route=\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"https:\/\/www.puzi7.net\/index.php?rest_route=%2Fwp%2Fv2%2Fcomments&post=601"}],"version-history":[{"count":0,"href":"https:\/\/www.puzi7.net\/index.php?rest_route=\/wp\/v2\/posts\/601\/revisions"}],"wp:attachment":[{"href":"https:\/\/www.puzi7.net\/index.php?rest_route=%2Fwp%2Fv2%2Fmedia&parent=601"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/www.puzi7.net\/index.php?rest_route=%2Fwp%2Fv2%2Fcategories&post=601"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/www.puzi7.net\/index.php?rest_route=%2Fwp%2Fv2%2Ftags&post=601"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}