{"id":327,"date":"2024-10-08T11:34:17","date_gmt":"2024-10-08T03:34:17","guid":{"rendered":"https:\/\/www.cgh0610.cn\/?p=327"},"modified":"2024-10-08T11:55:31","modified_gmt":"2024-10-08T03:55:31","slug":"git%e6%94%be%e5%bc%83%e5%bd%93%e5%89%8d%e7%bc%96%e8%be%91%e5%8c%ba%e7%9a%84%e5%85%a8%e9%83%a8%e7%bc%96%e8%be%91","status":"publish","type":"post","link":"https:\/\/www.cgh0610.cn\/?p=327","title":{"rendered":"Git\u653e\u5f03\u5f53\u524d\u7f16\u8f91\u533a\u7684\u5168\u90e8\u7f16\u8f91"},"content":{"rendered":"<p>\u5728 Git \u4e2d\uff0c\u82e5\u4f60\u6b63\u5728\u5bf9\u6587\u4ef6\u8fdb\u884c\u7f16\u8f91\u4e14\u5e0c\u671b\u653e\u5f03\u6240\u6709\u672a\u63d0\u4ea4\u7684\u66f4\u6539\uff08\u5373\u64a4\u9500\u5bf9\u6587\u4ef6\u7684\u4fee\u6539\uff09\uff0c\u4f60\u53ef\u4ee5\u6839\u636e\u6587\u4ef6\u7684\u5f53\u524d\u72b6\u6001\u91c7\u53d6\u4e0d\u540c\u7684\u64cd\u4f5c\u3002\u4ee5\u4e0b\u662f\u4e00\u4e9b\u5e38\u89c1\u7684\u65b9\u6cd5\uff1a<\/p>\n<p>\u82e5\u6587\u4ef6\u5df2\u88ab\u6dfb\u52a0\u5230\u6682\u5b58\u533a\uff08Staging Area\uff09\uff1a<br \/>\n\u5982\u679c\u4f60\u5df2\u7ecf\u4f7f\u7528 git add \u547d\u4ee4\u5c06\u6587\u4ef6\u6dfb\u52a0\u5230\u6682\u5b58\u533a\uff0c\u4f46\u4e4b\u540e\u51b3\u5b9a\u64a4\u9500\u8fd9\u4e9b\u66f4\u6539\uff0c\u4f60\u53ef\u4ee5\u4f7f\u7528 git reset HEAD &lt;\u6587\u4ef6> \u547d\u4ee4\u3002\u8fd9\u5c06\u4ece\u6682\u5b58\u533a\u4e2d\u79fb\u9664\u6587\u4ef6\uff0c\u4f46\u6587\u4ef6\u7684\u66f4\u6539\u4ecd\u4fdd\u7559\u5728\u5de5\u4f5c\u76ee\u5f55\u4e2d\u3002\u63a5\u4e0b\u6765\uff0c\u4f60\u53ef\u4ee5\u4f7f\u7528 git checkout &#8212; &lt;\u6587\u4ef6> \u6216 git restore &#8211;source=&lt;\u6587\u4ef6> &#8211;staged &#8211;worktree\uff08Git 2.23+ \u7248\u672c\uff09\u6765\u5b8c\u5168\u64a4\u9500\u8fd9\u4e9b\u66f4\u6539\u3002<br \/>\n\u4f46\u66f4\u7b80\u4fbf\u7684\u65b9\u6cd5\u662f\u76f4\u63a5\u4f7f\u7528 git restore &#8211;staged &#8211;worktree &lt;\u6587\u4ef6>\uff0c\u8be5\u547d\u4ee4\u4f1a\u540c\u65f6\u64a4\u9500\u6682\u5b58\u533a\u548c\u5de5\u4f5c\u76ee\u5f55\u4e2d\u7684\u66f4\u6539\uff08Git 2.23+\uff09\u3002\u82e5\u4f60\u4f7f\u7528\u7684\u662f\u65e7\u7248 Git\uff0c\u5219\u53ef\u80fd\u9700\u8981\u5206\u522b\u6267\u884c git reset HEAD &lt;\u6587\u4ef6> \u548c git checkout &#8212; &lt;\u6587\u4ef6>\u3002<\/p>\n<p>\u82e5\u6587\u4ef6\u5c1a\u672a\u6dfb\u52a0\u5230\u6682\u5b58\u533a\uff1a<br \/>\n\u5982\u679c\u6587\u4ef6\u66f4\u6539\u4ecd\u505c\u7559\u5728\u5de5\u4f5c\u76ee\u5f55\u4e2d\uff0c\u672a\u6dfb\u52a0\u5230\u6682\u5b58\u533a\uff0c\u4f60\u53ef\u4ee5\u76f4\u63a5\u4f7f\u7528 git checkout &#8212; &lt;\u6587\u4ef6> \u6216 git restore &#8211;source=&lt;\u6587\u4ef6> &#8211;worktree \u6765\u64a4\u9500\u8fd9\u4e9b\u66f4\u6539\u3002<br \/>\n\u64a4\u9500\u6574\u4e2a\u5de5\u4f5c\u76ee\u5f55\u7684\u66f4\u6539\uff1a<br \/>\n\u5982\u679c\u4f60\u60f3\u8981\u64a4\u9500\u5de5\u4f5c\u76ee\u5f55\u4e2d\u6240\u6709\u6587\u4ef6\u7684\u66f4\u6539\uff08\u5373\u653e\u5f03\u5f53\u524d\u7f16\u8f91\u533a\u7684\u5168\u90e8\u7f16\u8f91\uff09\uff0c\u53ef\u4ee5\u4f7f\u7528 git checkout &#8212; . \u6216 git restore &#8211;source=. &#8211;worktree\uff08Git 2.23+\uff09\u3002\u4f46\u8bf7\u6ce8\u610f\uff0c\u8fd9\u6837\u505a\u4f1a\u4e22\u5931\u6240\u6709\u672a\u63d0\u4ea4\u7684\u66f4\u6539\uff0c\u56e0\u6b64\u8bf7\u786e\u4fdd\u4f60\u4e0d\u518d\u9700\u8981\u8fd9\u4e9b\u66f4\u6539\u3002<br \/>\n\u5bf9\u4e8e Git 2.23 \u53ca\u66f4\u9ad8\u7248\u672c\uff0c\u63a8\u8350\u4f7f\u7528 git restore \u547d\u4ee4\uff0c\u56e0\u4e3a\u5b83\u63d0\u4f9b\u4e86\u66f4\u6e05\u6670\u7684\u9009\u9879\u6765\u533a\u5206\u6682\u5b58\u533a\u548c\u5de5\u4f5c\u76ee\u5f55\u7684\u66f4\u6539\u3002<\/p>\n<p>\u4f7f\u7528\u50a8\u85cf\uff08Stash\uff09\u529f\u80fd\uff1a<br \/>\n\u5982\u679c\u4f60\u60f3\u8981\u4fdd\u7559\u8fd9\u4e9b\u66f4\u6539\u4ee5\u4fbf\u7a0d\u540e\u5e94\u7528\uff0c\u4f46\u5f53\u524d\u9700\u8981\u64a4\u9500\u5b83\u4eec\uff0c\u53ef\u4ee5\u4f7f\u7528 git stash \u547d\u4ee4\u3002\u8fd9\u5c06\u4fdd\u5b58\u4f60\u7684\u66f4\u6539\u5230\u4e00\u4e2a\u50a8\u85cf\u4e2d\uff0c\u4f60\u53ef\u4ee5\u968f\u65f6\u4f7f\u7528 git stash pop \u6216 git stash apply \u6765\u91cd\u65b0\u5e94\u7528\u8fd9\u4e9b\u66f4\u6539\u3002<br \/>\n\u6e05\u7406\u5de5\u4f5c\u76ee\u5f55\uff1a<br \/>\n\u5728\u64a4\u9500\u66f4\u6539\u540e\uff0c\u5982\u679c\u4f60\u60f3\u8981\u786e\u4fdd\u5de5\u4f5c\u76ee\u5f55\u5b8c\u5168\u5e72\u51c0\uff08\u5373\u6ca1\u6709\u4efb\u4f55\u672a\u8ddf\u8e2a\u7684\u6587\u4ef6\u6216\u76ee\u5f55\uff09\uff0c\u53ef\u4ee5\u4f7f\u7528 git clean \u547d\u4ee4\u3002\u4f46\u8bf7\u8c28\u614e\u4f7f\u7528\u6b64\u547d\u4ee4\uff0c\u56e0\u4e3a\u5b83\u4f1a\u5220\u9664\u672a\u8ddf\u8e2a\u7684\u6587\u4ef6\u548c\u76ee\u5f55\uff0c\u4e14\u901a\u5e38\u6ca1\u6709\u64a4\u9500\u64cd\u4f5c\u3002<br \/>\n\u8bf7\u8bb0\u4f4f\uff0c\u5728\u64a4\u9500\u66f4\u6539\u4e4b\u524d\uff0c\u6700\u597d\u5148\u4f7f\u7528 git status \u547d\u4ee4\u6765\u67e5\u770b\u5f53\u524d\u7684\u5de5\u4f5c\u76ee\u5f55\u548c\u6682\u5b58\u533a\u72b6\u6001\uff0c\u4ee5\u786e\u4fdd\u4f60\u4e86\u89e3\u5c06\u8981\u64a4\u9500\u54ea\u4e9b\u66f4\u6539\u3002<\/p>\n<p>\u53e6\u5916\uff0c\u9700\u8981\u6ce8\u610f\u7684\u662f\uff0cgit checkout \u5728 Git 2.23 \u7248\u672c\u540e\u5df2\u88ab git switch \u548c git restore \u547d\u4ee4\u6240\u90e8\u5206\u53d6\u4ee3\uff0c\u7528\u4e8e\u66f4\u6e05\u6670\u5730\u7ba1\u7406\u5206\u652f\u548c\u5de5\u4f5c\u6811\u66f4\u6539\u3002\u56e0\u6b64\uff0c\u5982\u679c\u4f60\u4f7f\u7528\u7684\u662f\u8f83\u65b0\u7248\u672c\u7684 Git\uff0c\u5efa\u8bae\u719f\u6089\u5e76\u4f7f\u7528\u8fd9\u4e9b\u65b0\u547d\u4ee4\u3002\u4f46\u5728\u672c\u56de\u7b54\u4e2d\uff0c\u4e3a\u4e86\u517c\u5bb9\u6027\uff0c\u6211\u4ecd\u7136\u63d0\u5230\u4e86 git checkout \u547d\u4ee4\u3002<\/p>\n","protected":false},"excerpt":{"rendered":"<p>\u5728 Git \u4e2d\uff0c\u82e5\u4f60\u6b63\u5728\u5bf9\u6587\u4ef6\u8fdb\u884c\u7f16\u8f91\u4e14\u5e0c\u671b\u653e\u5f03\u6240\u6709\u672a\u63d0\u4ea4\u7684\u66f4\u6539\uff08\u5373\u64a4\u9500\u5bf9\u6587\u4ef6\u7684\u4fee\u6539\uff09\uff0c\u4f60\u53ef\u4ee5\u6839\u636e\u6587\u4ef6\u7684\u5f53\u524d\u72b6 &hellip; <a href=\"https:\/\/www.cgh0610.cn\/?p=327\" class=\"more-link\">\u7ee7\u7eed\u9605\u8bfb<span class=\"screen-reader-text\">Git\u653e\u5f03\u5f53\u524d\u7f16\u8f91\u533a\u7684\u5168\u90e8\u7f16\u8f91<\/span><\/a><\/p>\n","protected":false},"author":1,"featured_media":0,"comment_status":"closed","ping_status":"open","sticky":false,"template":"","format":"aside","meta":[],"categories":[77],"tags":[],"_links":{"self":[{"href":"https:\/\/www.cgh0610.cn\/index.php?rest_route=\/wp\/v2\/posts\/327"}],"collection":[{"href":"https:\/\/www.cgh0610.cn\/index.php?rest_route=\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/www.cgh0610.cn\/index.php?rest_route=\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/www.cgh0610.cn\/index.php?rest_route=\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"https:\/\/www.cgh0610.cn\/index.php?rest_route=%2Fwp%2Fv2%2Fcomments&post=327"}],"version-history":[{"count":2,"href":"https:\/\/www.cgh0610.cn\/index.php?rest_route=\/wp\/v2\/posts\/327\/revisions"}],"predecessor-version":[{"id":331,"href":"https:\/\/www.cgh0610.cn\/index.php?rest_route=\/wp\/v2\/posts\/327\/revisions\/331"}],"wp:attachment":[{"href":"https:\/\/www.cgh0610.cn\/index.php?rest_route=%2Fwp%2Fv2%2Fmedia&parent=327"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/www.cgh0610.cn\/index.php?rest_route=%2Fwp%2Fv2%2Fcategories&post=327"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/www.cgh0610.cn\/index.php?rest_route=%2Fwp%2Fv2%2Ftags&post=327"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}