{"id":19143,"date":"2024-11-19T15:25:47","date_gmt":"2024-11-19T07:25:47","guid":{"rendered":"https:\/\/fwq.ai\/blog\/19143\/"},"modified":"2024-11-19T15:25:47","modified_gmt":"2024-11-19T07:25:47","slug":"%e5%a6%82%e4%bd%95%e4%bd%bf%e7%94%a8git%e6%8f%90%e4%ba%a4%e9%83%a8%e5%88%86%e4%bf%ae%e6%94%b9%e7%9a%84%e5%8a%9f%e8%83%bd","status":"publish","type":"post","link":"https:\/\/fwq.ai\/blog\/19143\/","title":{"rendered":"\u5982\u4f55\u4f7f\u7528Git\u63d0\u4ea4\u90e8\u5206\u4fee\u6539\u7684\u529f\u80fd"},"content":{"rendered":"<p>git \u662f\u4e00\u79cd\u5206\u5e03\u5f0f\u7248\u672c\u63a7\u5236\u7cfb\u7edf\uff0c\u5b83\u975e\u5e38\u9002\u5408\u56e2\u961f\u534f\u4f5c\u6216\u4e2a\u4eba\u5f00\u53d1\u8005\u6765\u7ba1\u7406\u4ee3\u7801\u7684\u4fee\u6539\u5386\u53f2\u3002\u5728\u5f00\u53d1\u4e2d\uff0c\u7ecf\u5e38\u4f1a\u51fa\u73b0\u4e00\u79cd\u60c5\u51b5\uff1a\u9700\u8981\u5c06\u90e8\u5206\u4fee\u6539\u52a0\u5165\u5230\u63d0\u4ea4\u4e2d\uff0c\u800c\u4e0d\u662f\u5168\u90e8\u63d0\u4ea4\uff0c\u8fd9\u65f6\u5c31\u9700\u8981\u4f7f\u7528 git \u63d0\u4ea4\u90e8\u5206\u4fee\u6539\u7684\u529f\u80fd\u4e86\u3002<\/p>\n<p>Git \u63d0\u4ea4\u90e8\u5206\u4fee\u6539\u7684\u65b9\u5f0f\u6709\u4e24\u79cd\uff1a\u4e00\u79cd\u662f\u4f7f\u7528 Git add \u547d\u4ee4\u7684\u4ea4\u4e92\u5f0f\u6a21\u5f0f\uff0c\u53e6\u4e00\u79cd\u662f\u4f7f\u7528 Git stash \u547d\u4ee4\u3002<\/p>\n<h2>\u4f7f\u7528 Git add \u547d\u4ee4\u7684\u4ea4\u4e92\u5f0f\u6a21\u5f0f<\/h2>\n<p>Git add \u547d\u4ee4\u7528\u4e8e\u5c06\u5de5\u4f5c\u533a\u4e2d\u7684\u4fee\u6539\u6dfb\u52a0\u5230\u6682\u5b58\u533a\u3002\u4ea4\u4e92\u5f0f\u6a21\u5f0f\u5141\u8bb8\u6211\u4eec\u9009\u62e9\u8981\u6dfb\u52a0\u7684\u4fee\u6539\uff0c\u800c\u4e0d\u662f\u5c06\u6240\u6709\u4fee\u6539\u4e00\u6b21\u6027\u6dfb\u52a0\u5230\u6682\u5b58\u533a\u3002\u4f7f\u7528\u65b9\u6cd5\u5982\u4e0b\uff1a<\/p>\n<pre>git add -i<\/pre>\n<p>  \u767b\u5f55\u540e\u590d\u5236   <\/p>\n<p>\u6267\u884c\u4e0a\u8ff0\u547d\u4ee4\u540e\uff0c\u4f1a\u8fdb\u5165\u4ea4\u4e92\u5f0f\u6a21\u5f0f\u3002\u4ee5\u4e0b\u662f\u51e0\u4e2a\u5e38\u7528\u7684\u547d\u4ee4\uff1a<\/p>\n<ul>\n<li>p\uff1a\u9010\u4e2a\u8865\u4e01\u5730\u6dfb\u52a0\u6587\u4ef6\u7684\u4fee\u6539\uff1b<\/li>\n<li>s\uff1a\u9010\u4e2a\u8865\u4e01\u5730\u6dfb\u52a0\u6587\u4ef6\u7684\u4fee\u6539\uff0c\u5e76\u5c06\u4e0e\u6682\u5b58\u533a\u4e0d\u540c\u7684\u4fee\u6539\u653e\u5165\u6682\u5b58\u533a\uff1b<\/li>\n<li>q\uff1a\u9000\u51fa\u4ea4\u4e92\u5f0f\u6a21\u5f0f\u3002<\/li>\n<\/ul>\n<p>\u4ee5\u6dfb\u52a0\u4fee\u6539\u6587\u4ef6 example.py \u4e2d\u7684\u4e00\u90e8\u5206\u4e3a\u4f8b\uff0c\u6267\u884c\u4ee5\u4e0b\u547d\u4ee4\uff1a<\/p>\n<pre>git add -i example.py<\/pre>\n<p>  \u767b\u5f55\u540e\u590d\u5236   <\/p>\n<p>\u7136\u540e\u9009\u62e9 p\uff0c\u63a5\u7740 Git \u4f1a\u663e\u793a\u4fee\u6539\u7684\u5dee\u5f02\uff0c\u8ba9\u6211\u4eec\u5206\u522b\u9009\u62e9\u8981\u6dfb\u52a0\u7684\u4fee\u6539\u548c\u4e0d\u6dfb\u52a0\u7684\u4fee\u6539\u3002\u9009\u62e9\u5b8c\u6210\u540e\uff0c\u4f7f\u7528 q \u547d\u4ee4\u9000\u51fa\u4ea4\u4e92\u5f0f\u6a21\u5f0f\u3002\u6b64\u65f6\uff0c\u53ea\u6709\u9009\u62e9\u7684\u4fee\u6539\u88ab\u6dfb\u52a0\u5230\u6682\u5b58\u533a\uff0c\u5176\u4f59\u7684\u4fee\u6539\u4ecd\u7136\u7559\u5728\u5de5\u4f5c\u533a\u4e2d\u3002<\/p>\n<h2>\u4f7f\u7528 Git stash \u547d\u4ee4<\/h2>\n<p>Git stash \u547d\u4ee4\u7528\u4e8e\u4fdd\u5b58\u5f53\u524d\u7684\u4fee\u6539\uff0c\u5c06\u5de5\u4f5c\u533a\u548c\u6682\u5b58\u533a\u7684\u4fee\u6539\u5168\u90e8\u5b58\u50a8\u8d77\u6765\uff0c\u5e76\u5c06\u5de5\u4f5c\u533a\u6062\u590d\u5230\u4e0a\u4e00\u6b21\u63d0\u4ea4\u7684\u72b6\u6001\u3002\u8fd9\u79cd\u65b9\u5f0f\u53ef\u4ee5\u907f\u514d\u624b\u5de5\u63d0\u4ea4\u90e8\u5206\u4fee\u6539\u65f6\u51fa\u73b0\u7684\u9519\u8bef\uff0c\u4e5f\u53ef\u4ee5\u5c06\u73b0\u6709\u7684\u4fee\u6539\u6682\u65f6\u653e\u5728\u4e00\u8fb9\uff0c\u65b9\u4fbf\u6211\u4eec\u53bb\u5904\u7406\u5176\u4ed6\u7684\u4e8b\u60c5\u3002<\/p>\n<p>\u4f7f\u7528 Git stash \u547d\u4ee4\u7684\u65b9\u6cd5\u5982\u4e0b\uff1a<\/p>\n<pre>git stash<\/pre>\n<p>  \u767b\u5f55\u540e\u590d\u5236   <\/p>\n<p>\u6267\u884c\u4e0a\u8ff0\u547d\u4ee4\u540e\uff0cGit \u4f1a\u5c06\u5f53\u524d\u5de5\u4f5c\u533a\u548c\u6682\u5b58\u533a\u7684\u4fee\u6539\u5168\u90e8\u5b58\u50a8\u8d77\u6765\uff0c\u5e76\u5c06\u5de5\u4f5c\u533a\u6062\u590d\u5230\u4e0a\u4e00\u6b21\u63d0\u4ea4\u7684\u72b6\u6001\u3002\u6b64\u65f6\uff0c\u6211\u4eec\u5c31\u53ef\u4ee5\u5728\u4e0d\u5f71\u54cd\u539f\u672c\u4fee\u6539\u7684\u60c5\u51b5\u4e0b\uff0c\u8fdb\u884c\u5176\u4ed6\u7684\u64cd\u4f5c\u3002<\/p>\n<p>\u7136\u540e\u6211\u4eec\u53ef\u4ee5\u4f7f\u7528\u4ee5\u4e0b\u547d\u4ee4\u5f39\u51fa\uff08\u5e94\u7528\uff09\u5b58\u50a8\u7684\u4fee\u6539\uff1a<\/p>\n<pre>git stash pop<\/pre>\n<p>  \u767b\u5f55\u540e\u590d\u5236   <\/p>\n<p>\u6b64\u547d\u4ee4\u5c06\u4e4b\u524d\u5b58\u50a8\u7684\u4fee\u6539\u5e94\u7528\u5230\u5de5\u4f5c\u533a\uff0c\u5e76\u5c06\u5176\u4ece\u5b58\u50a8\u5217\u8868\u4e2d\u5220\u9664\u3002\u5982\u679c\u9700\u8981\u591a\u6b21\u6267\u884c\u8be5\u64cd\u4f5c\uff0c\u53ef\u4ee5\u4f7f\u7528 git stash list \u67e5\u770b\u4e4b\u524d\u5b58\u50a8\u7684\u4fee\u6539\uff0c\u5e76\u4f7f\u7528 git stash apply  \u5e94\u7528\u6307\u5b9a\u7684\u4fee\u6539\u3002 <\/p>\n<p>\u603b\u4e4b\uff0c\u901a\u8fc7\u4f7f\u7528\u4e0a\u8ff0\u4e24\u79cd\u65b9\u5f0f\u7684\u5176\u4e2d\u4e00\u79cd\uff0c\u6211\u4eec\u5c31\u53ef\u4ee5\u8f7b\u677e\u5730\u63d0\u4ea4\u90e8\u5206\u4fee\u6539\uff0c\u800c\u4e0d\u5fc5\u5c06\u6240\u6709\u7684\u4fee\u6539\u4e00\u6b21\u6027\u63d0\u4ea4\u3002\u8fd9\u6837\u53ef\u4ee5\u5927\u5927\u63d0\u9ad8\u6211\u4eec\u7684\u5de5\u4f5c\u6548\u7387\uff0c\u5e76\u907f\u514d\u4e00\u4e9b\u9519\u8bef\u7684\u63d0\u4ea4\u3002<\/p>\n<p>\u4ee5\u4e0a\u5c31\u662f\u5982\u4f55\u4f7f\u7528Git\u63d0\u4ea4\u90e8\u5206\u4fee\u6539\u7684\u529f\u80fd\u7684\u8be6\u7ec6\u5185\u5bb9\uff0c\u66f4\u591a\u8bf7\u5173\u6ce8\u7c73\u4e91\u5176\u5b83\u76f8\u5173\u6587\u7ae0\uff01<\/p>\n","protected":false},"excerpt":{"rendered":"<p>git \u662f\u4e00\u79cd\u5206\u5e03\u5f0f\u7248\u672c\u63a7\u5236\u7cfb\u7edf\uff0c\u5b83\u975e\u5e38\u9002\u5408\u56e2\u961f\u534f\u4f5c\u6216\u4e2a\u4eba\u5f00\u53d1\u8005\u6765\u7ba1\u7406\u4ee3\u7801\u7684\u4fee\u6539\u5386\u53f2\u3002\u5728\u5f00\u53d1\u4e2d\uff0c\u7ecf\u5e38\u4f1a\u51fa\u73b0\u4e00\u79cd\u60c5\u51b5\uff1a\u9700\u8981\u5c06\u90e8\u5206\u4fee\u6539\u52a0\u5165\u5230\u63d0\u4ea4\u4e2d\uff0c\u800c\u4e0d\u662f\u5168\u90e8\u63d0\u4ea4\uff0c\u8fd9\u65f6\u5c31\u9700\u8981\u4f7f\u7528 git \u63d0\u4ea4\u90e8\u5206\u4fee\u6539\u7684\u529f\u80fd\u4e86\u3002 Git \u63d0\u4ea4\u90e8\u5206\u4fee\u6539\u7684\u65b9\u5f0f\u6709\u4e24\u79cd\uff1a\u4e00\u79cd\u662f\u4f7f\u7528 Git add \u547d\u4ee4\u7684\u4ea4\u4e92\u5f0f\u6a21\u5f0f\uff0c\u53e6\u4e00\u79cd\u662f\u4f7f\u7528 Git stash \u547d\u4ee4\u3002 \u4f7f\u7528 Git add \u547d\u4ee4\u7684\u4ea4\u4e92\u5f0f\u6a21\u5f0f Git add \u547d\u4ee4\u7528\u4e8e\u5c06\u5de5\u4f5c\u533a\u4e2d\u7684\u4fee\u6539\u6dfb\u52a0\u5230\u6682\u5b58\u533a\u3002\u4ea4\u4e92\u5f0f\u6a21\u5f0f\u5141\u8bb8\u6211\u4eec\u9009\u62e9\u8981\u6dfb\u52a0\u7684\u4fee\u6539\uff0c\u800c\u4e0d\u662f\u5c06\u6240\u6709\u4fee\u6539\u4e00\u6b21\u6027\u6dfb\u52a0\u5230\u6682\u5b58\u533a\u3002\u4f7f\u7528\u65b9\u6cd5\u5982\u4e0b\uff1a git add -i \u767b\u5f55\u540e\u590d\u5236 \u6267\u884c\u4e0a\u8ff0\u547d\u4ee4\u540e\uff0c\u4f1a\u8fdb\u5165\u4ea4\u4e92\u5f0f\u6a21\u5f0f\u3002\u4ee5\u4e0b\u662f\u51e0\u4e2a\u5e38\u7528\u7684\u547d\u4ee4\uff1a p\uff1a\u9010\u4e2a\u8865\u4e01\u5730\u6dfb\u52a0\u6587\u4ef6\u7684\u4fee\u6539\uff1b s\uff1a\u9010\u4e2a\u8865\u4e01\u5730\u6dfb\u52a0\u6587\u4ef6\u7684\u4fee\u6539\uff0c\u5e76\u5c06\u4e0e\u6682\u5b58\u533a\u4e0d\u540c\u7684\u4fee\u6539\u653e\u5165\u6682\u5b58\u533a\uff1b q\uff1a\u9000\u51fa\u4ea4\u4e92\u5f0f\u6a21\u5f0f\u3002 \u4ee5\u6dfb\u52a0\u4fee\u6539\u6587\u4ef6 example.py \u4e2d\u7684\u4e00\u90e8\u5206\u4e3a\u4f8b\uff0c\u6267\u884c\u4ee5\u4e0b\u547d\u4ee4\uff1a git add -i example.py \u767b\u5f55\u540e\u590d\u5236 \u7136\u540e\u9009\u62e9 p\uff0c\u63a5\u7740 Git \u4f1a\u663e\u793a\u4fee\u6539\u7684\u5dee\u5f02\uff0c\u8ba9\u6211\u4eec\u5206\u522b\u9009\u62e9\u8981\u6dfb\u52a0\u7684\u4fee\u6539\u548c\u4e0d\u6dfb\u52a0\u7684\u4fee\u6539\u3002\u9009\u62e9\u5b8c\u6210\u540e\uff0c\u4f7f\u7528 q \u547d\u4ee4\u9000\u51fa\u4ea4\u4e92\u5f0f\u6a21\u5f0f\u3002\u6b64\u65f6\uff0c\u53ea\u6709\u9009\u62e9\u7684\u4fee\u6539\u88ab\u6dfb\u52a0\u5230\u6682\u5b58\u533a\uff0c\u5176\u4f59\u7684\u4fee\u6539\u4ecd\u7136\u7559\u5728\u5de5\u4f5c\u533a\u4e2d\u3002 \u4f7f\u7528 Git stash \u547d\u4ee4 Git stash \u547d\u4ee4\u7528\u4e8e\u4fdd\u5b58\u5f53\u524d\u7684\u4fee\u6539\uff0c\u5c06\u5de5\u4f5c\u533a\u548c\u6682\u5b58\u533a\u7684\u4fee\u6539\u5168\u90e8\u5b58\u50a8\u8d77\u6765\uff0c\u5e76\u5c06\u5de5\u4f5c\u533a\u6062\u590d\u5230\u4e0a\u4e00\u6b21\u63d0\u4ea4\u7684\u72b6\u6001\u3002\u8fd9\u79cd\u65b9\u5f0f\u53ef\u4ee5\u907f\u514d\u624b\u5de5\u63d0\u4ea4\u90e8\u5206\u4fee\u6539\u65f6\u51fa\u73b0\u7684\u9519\u8bef\uff0c\u4e5f\u53ef\u4ee5\u5c06\u73b0\u6709\u7684\u4fee\u6539\u6682\u65f6\u653e\u5728\u4e00\u8fb9\uff0c\u65b9\u4fbf\u6211\u4eec\u53bb\u5904\u7406\u5176\u4ed6\u7684\u4e8b\u60c5\u3002 \u4f7f\u7528 Git stash \u547d\u4ee4\u7684\u65b9\u6cd5\u5982\u4e0b\uff1a git stash \u767b\u5f55\u540e\u590d\u5236 [&hellip;]<\/p>\n","protected":false},"author":1,"featured_media":0,"comment_status":"closed","ping_status":"","sticky":false,"template":"","format":"standard","meta":{"footnotes":""},"categories":[16],"tags":[],"class_list":["post-19143","post","type-post","status-publish","format-standard","hentry","category-16"],"_links":{"self":[{"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/posts\/19143","targetHints":{"allow":["GET"]}}],"collection":[{"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/comments?post=19143"}],"version-history":[{"count":0,"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/posts\/19143\/revisions"}],"wp:attachment":[{"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/media?parent=19143"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/categories?post=19143"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/tags?post=19143"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}