{"id":36,"date":"2023-06-03T15:22:29","date_gmt":"2023-06-03T07:22:29","guid":{"rendered":"http:\/\/niuguodong.com\/?p=36"},"modified":"2025-12-25T15:39:29","modified_gmt":"2025-12-25T07:39:29","slug":"git%e8%b4%ae%e8%97%8f","status":"publish","type":"post","link":"https:\/\/niuguodong.com\/index.php\/2023\/06\/03\/git%e8%b4%ae%e8%97%8f\/","title":{"rendered":"Git\u8d2e\u85cf"},"content":{"rendered":"\n<h1 class=\"wp-block-heading\">Git\u8d2e\u85cf<\/h1>\n\n\n\n<p>\u8d2e\u85cf<\/p>\n\n\n\n<h2 class=\"wp-block-heading\">git stash<\/h2>\n\n\n\n<p><code>git stash<\/code> \u662f Git \u4e2d\u7528\u4e8e\u4e34\u65f6\u4fdd\u5b58\u5de5\u4f5c\u76ee\u5f55\u548c\u6682\u5b58\u533a\u53d8\u66f4\u7684\u547d\u4ee4\uff0c\u9002\u7528\u4e8e\u9700\u8981\u5207\u6362\u5206\u652f\u3001\u5904\u7406\u7d27\u6025\u4efb\u52a1\u6216\u4fdd\u6301\u5de5\u4f5c\u533a\u201c\u5e72\u51c0\u201d\u7684\u573a\u666f\u3002<\/p>\n\n\n\n<pre class=\"wp-block-code\"><code>git stash<\/code><\/pre>\n\n\n\n<p>git stash \u9ed8\u8ba4\u53ea\u4fdd\u5b58\u5df2\u8ddf\u8e2a\u6587\u4ef6\uff08Tracked files\uff09\u7684\u4fee\u6539\u548c\u6682\u5b58\u533a\uff08Stage\uff09\u7684\u53d8\u66f4\uff0c\u4e0d\u4f1a\u81ea\u52a8\u4fdd\u5b58\u672a\u8ddf\u8e2a\u7684\u6587\u4ef6\uff08Untracked files\uff09<\/p>\n\n\n\n<figure class=\"wp-block-image size-full\"><div class='fancybox-wrapper lazyload-container-unload' data-fancybox='post-images' href='https:\/\/niuguodong.com\/wp-content\/uploads\/2023\/05\/image.png'><img class=\"lazyload lazyload-style-1\" src=\"data:image\/svg+xml;base64,PCEtLUFyZ29uTG9hZGluZy0tPgo8c3ZnIHdpZHRoPSIxIiBoZWlnaHQ9IjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgc3Ryb2tlPSIjZmZmZmZmMDAiPjxnPjwvZz4KPC9zdmc+\"  loading=\"lazy\" decoding=\"async\" width=\"714\" height=\"852\" data-original=\"https:\/\/niuguodong.com\/wp-content\/uploads\/2023\/05\/image.png\" src=\"data:image\/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsQAAA7EAZUrDhsAAAANSURBVBhXYzh8+PB\/AAffA0nNPuCLAAAAAElFTkSuQmCC\" alt=\"\" class=\"wp-image-417\"  sizes=\"auto, (max-width: 714px) 100vw, 714px\" \/><\/div><\/figure>\n\n\n\n<p>\u4f7f\u7528git stash\u540e\uff0c\u4f1a\u591a\u51fa2\u4e2a\u63d0\u4ea4\uff0cindex on dev\u5bf9\u5e94\u5df2\u5df2git add\u7684\u4fee\u6539\uff0cWIP on dev\u5bf9\u5e94\u672agit add\u7684\u4fee\u6539\uff0c\u8fd92\u4e2a\u5206\u652f\u90fd\u57fa\u4e8e\u4f7f\u7528git stash\u65f6\u6240\u5904\u7684\u5206\u652f\u5bf9\u5e94\u7684\u6700\u65b0\u63d0\u4ea4\u3002<\/p>\n\n\n\n<p>git log --oneline --graph --all\u547d\u4ee4\u4f1a\u7ed8\u5236\u6240\u6709\u63d0\u4ea4\u7684\u5173\u8054\u5173\u7cfb\uff0c\u6240\u4ee5\u80fd\u770b\u5230\u8fd92\u4e2a\u672c\u5e94\u9690\u85cf\u7684\u63d0\u4ea4<\/p>\n\n\n\n<p>\u5982\u679c\u4e0d\u52a0--all\u9009\u9879\uff0c\u5219git stash\u6240\u521b\u5efa\u76842\u4e2a\u63d0\u4ea4\u4e0d\u4f1a\u663e\u793a<\/p>\n\n\n\n<figure class=\"wp-block-image size-full\"><div class='fancybox-wrapper lazyload-container-unload' data-fancybox='post-images' href='https:\/\/niuguodong.com\/wp-content\/uploads\/2023\/05\/image-1.png'><img class=\"lazyload lazyload-style-1\" src=\"data:image\/svg+xml;base64,PCEtLUFyZ29uTG9hZGluZy0tPgo8c3ZnIHdpZHRoPSIxIiBoZWlnaHQ9IjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgc3Ryb2tlPSIjZmZmZmZmMDAiPjxnPjwvZz4KPC9zdmc+\"  loading=\"lazy\" decoding=\"async\" width=\"515\" height=\"129\" data-original=\"https:\/\/niuguodong.com\/wp-content\/uploads\/2023\/05\/image-1.png\" src=\"data:image\/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsQAAA7EAZUrDhsAAAANSURBVBhXYzh8+PB\/AAffA0nNPuCLAAAAAElFTkSuQmCC\" alt=\"\" class=\"wp-image-418\"  sizes=\"auto, (max-width: 515px) 100vw, 515px\" \/><\/div><\/figure>\n\n\n\n<h2 class=\"wp-block-heading\">\u67e5\u770b\u8d2e\u85cf<\/h2>\n\n\n\n<h3 class=\"wp-block-heading\">\u67e5\u770b\u8d2e\u85cf\u6761\u76ee<\/h3>\n\n\n\n<pre class=\"wp-block-code\"><code>git stash list<\/code><\/pre>\n\n\n\n<h3 class=\"wp-block-heading\">\u67e5\u770b\u8d2e\u85cf\u8bb0\u5f55\u53ca\u5185\u5bb9<\/h3>\n\n\n\n<pre class=\"wp-block-code\"><code># \u7b80\u8981\ngit stash show\n\n# \u8be6\u7ec6\ngit stash show -p\n\n# \u67e5\u770b\u6307\u5b9a\u8d2e\u85cf\u5185\u5bb9\ngit stash show stash@{0}\ngit stash show -p stash@{0}<\/code><\/pre>\n\n\n\n<h2 class=\"wp-block-heading\">\u4e3a\u8d2e\u85cf\u5907\u6ce8<\/h2>\n\n\n\n<pre class=\"wp-block-code\"><code>git stash push -m \"xx\"<\/code><\/pre>\n\n\n\n<figure class=\"wp-block-image size-full\"><div class='fancybox-wrapper lazyload-container-unload' data-fancybox='post-images' href='https:\/\/niuguodong.com\/wp-content\/uploads\/2023\/05\/image-2.png'><img class=\"lazyload lazyload-style-1\" src=\"data:image\/svg+xml;base64,PCEtLUFyZ29uTG9hZGluZy0tPgo8c3ZnIHdpZHRoPSIxIiBoZWlnaHQ9IjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgc3Ryb2tlPSIjZmZmZmZmMDAiPjxnPjwvZz4KPC9zdmc+\"  loading=\"lazy\" decoding=\"async\" width=\"420\" height=\"256\" data-original=\"https:\/\/niuguodong.com\/wp-content\/uploads\/2023\/05\/image-2.png\" src=\"data:image\/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsQAAA7EAZUrDhsAAAANSURBVBhXYzh8+PB\/AAffA0nNPuCLAAAAAElFTkSuQmCC\" alt=\"\" class=\"wp-image-419\"  sizes=\"auto, (max-width: 420px) 100vw, 420px\" \/><\/div><\/figure>\n\n\n\n<h3 class=\"wp-block-heading\">\u8d2e\u85cf\u6307\u5b9a\u6587\u4ef6<\/h3>\n\n\n\n<pre class=\"wp-block-code\"><code>git stash push -m \"xx\" filename<\/code><\/pre>\n\n\n\n<p>\u8be5\u547d\u4ee4\u5e76\u4e0d\u4f1a\u4ec5\u5c06\u6307\u5b9a\u6587\u4ef6\u4ece\u5de5\u4f5c\u533a\u8f6c\u79fb\u81f3\u8d2e\u85cf\u533a\uff0c\u867d\u7136\u5de5\u4f5c\u533a\u4e2d\u7684\u8be5\u6587\u4ef6\u4f1a\u88ab\u5220\u9664\uff0c\u4f46\u5de5\u4f5c\u533a\u4e2d\u5df2\u7ecf\u6682\u5b58\u7684\u5176\u4ed6\u6587\u4ef6\u5168\u90e8\u90fd\u4f1a\u88ab\u590d\u5236\u4e00\u4efd\u5230\u8d2e\u85cf\u533a\uff0c\u800c\u4e14\u4e0d\u4f1a\u5220\u9664\u5176\u4ed6\u6587\u4ef6\u5728\u5de5\u4f5c\u533a\u4e2d\u7684\u6682\u5b58<\/p>\n\n\n\n<h2 class=\"wp-block-heading\">\u8d2e\u85cf\u672a\u8ddf\u8e2a\u7684\u6587\u4ef6<\/h2>\n\n\n\n<pre class=\"wp-block-code\"><code>git stash push -m \"xx\" -u<\/code><\/pre>\n\n\n\n<p>\u4f1a\u5c06\u672a\u8ddf\u8e2a\uff08git add . )\u7684\u6587\u4ef6\u4e5f\u8d2e\u85cf\uff0c\u4f46\u4e0d\u4f1a\u8d2e\u85cf\u5728.gitignore\u4e2d\u5ffd\u7565\u7684\u6587\u4ef6<\/p>\n\n\n\n<h2 class=\"wp-block-heading\">\u53d6\u51fa\u8d2e\u85cf<\/h2>\n\n\n\n<figure class=\"wp-block-image size-full\"><div class='fancybox-wrapper lazyload-container-unload' data-fancybox='post-images' href='https:\/\/niuguodong.com\/wp-content\/uploads\/2023\/05\/image-3.png'><img class=\"lazyload lazyload-style-1\" src=\"data:image\/svg+xml;base64,PCEtLUFyZ29uTG9hZGluZy0tPgo8c3ZnIHdpZHRoPSIxIiBoZWlnaHQ9IjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgc3Ryb2tlPSIjZmZmZmZmMDAiPjxnPjwvZz4KPC9zdmc+\"  loading=\"lazy\" decoding=\"async\" width=\"517\" height=\"831\" data-original=\"https:\/\/niuguodong.com\/wp-content\/uploads\/2023\/05\/image-3.png\" src=\"data:image\/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsQAAA7EAZUrDhsAAAANSURBVBhXYzh8+PB\/AAffA0nNPuCLAAAAAElFTkSuQmCC\" alt=\"\" class=\"wp-image-420\"  sizes=\"auto, (max-width: 517px) 100vw, 517px\" \/><\/div><\/figure>\n\n\n\n<p>\u53ef\u4ee5\u770b\u5230\uff0c\u4f7f\u7528git stash pop\u547d\u4ee4\u540e\uff0c\u5f53\u524d\u7684\u5de5\u4f5c\u533a\u72b6\u6001\u53c8\u548cgit stash\u4e4b\u524d\u4e00\u6837\u4e86<\/p>\n\n\n\n<p><strong>\u6ce8\u610f<\/strong><\/p>\n\n\n\n<p>\u53ef\u4ee5\u5728\u4efb\u610f\u7684\u5206\u652f\u4e0a\u4f7f\u7528git stash pop\u547d\u4ee4\uff0c\u8fd9\u5c31\u5bfc\u81f4\uff0c\u539f\u672c\u5728dev\u5206\u652f\u7684\u6700\u65b0\u63d0\u4ea4\u4e4b\u4e0a\u6240\u4f5c\u7684\u5de5\u4f5c\uff0c\u5728\u88ab\u8d2e\u85cf\u5230\u57fa\u4e8edev\u7684\u8d2e\u85cf\u533a\u540e\uff0c\u5982\u679c\u8fd9\u65f6\u5019\u5207\u6362\u4e86\u5206\u652f\uff0c\u5e76\u4e14\u4f7f\u7528\u4e86git stash pop\u547d\u4ee4\uff0c\u5c31\u4f1a\u5bfc\u81f4\u8fd9\u4e9b\u8d2e\u85cf\u4f1a\u88ab\u6062\u590d\u5230\u5176\u4ed6\uff08\u5f53\u524d\u6240\u5728\uff09\u7684\u5206\u652f\u4e0a<\/p>\n\n\n\n<p>\u4f7f\u7528\u8fd9\u4e00\u70b9\uff0c\u53ef\u4ee5\u8de8\u5206\u652f\u8f6c\u79fb\u4e00\u4e9b\u5185\u5bb9\uff0c\u4f46\u4e5f\u9700\u8981\u6ce8\u610f\u53ef\u80fd\u4f1a\u88ab\u8f6c\u79fb\u5230\u4e0d\u5408\u9002\u7684\u5206\u652f\uff08\u7684\u6700\u65b0\u63d0\u4ea4\uff09\u4e0a\u3002<\/p>\n\n\n\n<h3 class=\"wp-block-heading\">\u8d2e\u85cf\u7684\u53d6\u51fa\u987a\u5e8f<\/h3>\n\n\n\n<p>\u8d2e\u85cf\u7684\u5b58\u5165\u4e0e\u53d6\u51fa\u7684\u9ed8\u8ba4\u987a\u5e8f\uff08\u4ec5\u4f7f\u7528git stash pop\uff09\u7c7b\u4f3c\u4e8e\u6808\uff0c\u5148\u8fdb\u540e\u51fa\uff0c\u5982\u4e0b\u662f\u8fde\u7eed\u8d2e\u85cf2\u6b21<\/p>\n\n\n\n<figure class=\"wp-block-image size-full\"><div class='fancybox-wrapper lazyload-container-unload' data-fancybox='post-images' href='https:\/\/niuguodong.com\/wp-content\/uploads\/2023\/05\/image-4.png'><img class=\"lazyload lazyload-style-1\" src=\"data:image\/svg+xml;base64,PCEtLUFyZ29uTG9hZGluZy0tPgo8c3ZnIHdpZHRoPSIxIiBoZWlnaHQ9IjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgc3Ryb2tlPSIjZmZmZmZmMDAiPjxnPjwvZz4KPC9zdmc+\"  loading=\"lazy\" decoding=\"async\" width=\"564\" height=\"804\" data-original=\"https:\/\/niuguodong.com\/wp-content\/uploads\/2023\/05\/image-4.png\" src=\"data:image\/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsQAAA7EAZUrDhsAAAANSURBVBhXYzh8+PB\/AAffA0nNPuCLAAAAAElFTkSuQmCC\" alt=\"\" class=\"wp-image-422\"  sizes=\"auto, (max-width: 564px) 100vw, 564px\" \/><\/div><\/figure>\n\n\n\n<p>\u6700\u540e\u7528git stash list\u547d\u4ee4\u53ef\u4ee5\u770b\u51fa\uff0ctest\u8bb0\u5f55\u662f\u5148\u8d2e\u85cf\u7684\uff0c\u4f46\u8d2e\u85cf\u7d22\u5f15\u662f1\uff0ctest1\u8bb0\u5f55\u662f\u540e\u8d2e\u85cf\u7684\uff0c\u8d2e\u85cf\u7d22\u5f15\u662f0\uff0c\u5982\u679c\u8fde\u7eed\u6267\u884c2\u6b21git stash pop\u547d\u4ee4\uff0c\u5219\u7b2c\u4e00\u6b21\u53d6\u51fatest1\uff0c\u7b2c\u4e8c\u6b21\u53d6\u51fatest<\/p>\n\n\n\n<h3 class=\"wp-block-heading\">\u53d6\u51fa\u6307\u5b9a\u7684\u8d2e\u85cf<\/h3>\n\n\n\n<pre class=\"wp-block-code\"><code>git stash pop stash@{n}<\/code><\/pre>\n\n\n\n<p>\u67d0\u4e00\u6761\u8d2e\u85cf\u88ab\u53d6\u51fa\u540e\uff0c\u8d2e\u85cf\u533a\u91cc\u7684\u5bf9\u5e94\u8bb0\u5f55\u5185\u5bb9\u4f1a\u88ab\u5220\u9664<\/p>\n\n\n\n<h3 class=\"wp-block-heading\">\u5c06\u8d2e\u85cf\u53d6\u51fa\u4f46\u4e0d\u5220\u9664<\/h3>\n\n\n\n<pre class=\"wp-block-code\"><code>git stash apply #\u53ea\u4f1a\u53d6\u51fa\u6700\u65b0\u7684\u4e00\u6b21\u6682\u5b58\ngit stash apply stash@{n}<\/code><\/pre>\n\n\n\n<h3 class=\"wp-block-heading\">\u5220\u9664\u8d2e\u85cf<\/h3>\n\n\n\n<pre class=\"wp-block-code\"><code># \u5220\u9664\u6700\u65b0\u7684\u8d2e\u85cfgit stash drop\n# \u5220\u9664\u6307\u5b9a\u7684\u8d2e\u85cfgit stash drop stash@{n}\n\n# \u5220\u9664\u6240\u6709\u8d2e\u85cfgit stash clear<\/code><\/pre>\n\n\n\n<p>\u6ce8\u610f\uff1a\u65e0\u8bba\u54ea\u79cd\u65b9\u6cd5\u5220\u9664\u8d2e\u85cf\uff0c\u90fd\u65e0\u6cd5\u6062\u590d<\/p>\n","protected":false},"excerpt":{"rendered":"<p>Git\u8d2e\u85cf \u8d2e\u85cf git stash git stash \u662f Git \u4e2d\u7528\u4e8e\u4e34\u65f6\u4fdd\u5b58\u5de5\u4f5c\u76ee\u5f55\u548c\u6682\u5b58\u533a\u53d8\u66f4\u7684\u547d\u4ee4 [&hellip;]<\/p>\n","protected":false},"author":1,"featured_media":0,"comment_status":"open","ping_status":"closed","sticky":false,"template":"","format":"standard","meta":[],"categories":[6,5],"tags":[],"class_list":["post-36","post","type-post","status-publish","format-standard","hentry","category-git","category-5"],"_links":{"self":[{"href":"https:\/\/niuguodong.com\/index.php\/wp-json\/wp\/v2\/posts\/36","targetHints":{"allow":["GET"]}}],"collection":[{"href":"https:\/\/niuguodong.com\/index.php\/wp-json\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/niuguodong.com\/index.php\/wp-json\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/niuguodong.com\/index.php\/wp-json\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"https:\/\/niuguodong.com\/index.php\/wp-json\/wp\/v2\/comments?post=36"}],"version-history":[{"count":0,"href":"https:\/\/niuguodong.com\/index.php\/wp-json\/wp\/v2\/posts\/36\/revisions"}],"wp:attachment":[{"href":"https:\/\/niuguodong.com\/index.php\/wp-json\/wp\/v2\/media?parent=36"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/niuguodong.com\/index.php\/wp-json\/wp\/v2\/categories?post=36"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/niuguodong.com\/index.php\/wp-json\/wp\/v2\/tags?post=36"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}