{"id":699,"date":"2019-11-08T14:13:58","date_gmt":"2019-11-08T06:13:58","guid":{"rendered":"http:\/\/prayerlaputa.com\/?p=699"},"modified":"2019-11-08T14:14:38","modified_gmt":"2019-11-08T06:14:38","slug":"git%e4%bd%bf%e7%94%a8%e6%8a%80%e5%b7%a7-stash%e4%bf%9d%e5%ad%98%e7%8e%b0%e5%9c%ba%ef%bc%8c%e6%81%a2%e5%a4%8d%e7%8e%b0%e5%9c%ba","status":"publish","type":"post","link":"http:\/\/prayerlaputa.com\/?p=699","title":{"rendered":"git\u4f7f\u7528\u6280\u5de7-stash\u4fdd\u5b58\u73b0\u573a\uff0c\u6062\u590d\u73b0\u573a"},"content":{"rendered":"<p>git stash\u547d\u4ee4\uff1a\u4fdd\u5b58\u73b0\u573a\u3001\u6062\u590d\u73b0\u573a<\/p>\n<div class=\"mume markdown-preview \">\n<ul>\n<li>\u529f\u80fd\uff1a\u5c06git \u5de5\u4f5c\u533a\u4e2d\u7684\u6570\u636e\u6682\u5b58\u8d77\u6765\uff0c\u4fdd\u5b58\u73b0\u573a\uff0c\u4ee5\u53ca\u540e\u7eed\u7684\u6062\u590d\u73b0\u573a\uff0c\u7c7b\u4f3c\u4e8e\u51fd\u6570\u8c03\u7528\u7684\u4fdd\u5b58\u73b0\u573a\u3001\u6062\u590d\u73b0\u573a<\/li>\n<li>\u4f7f\u7528\u573a\u666f\uff1a\u6b63\u5728\u5f00\u53d1\u4e00\u4e2a\u4ee3\u7801\uff0c\u7f16\u5199\u5230\u4e00\u534a\uff0c\u9700\u8981\u5c06\u4ee3\u7801\u6062\u590d\u5230\u67d0\u4e2a\u7248\u672c\u4fee\u590d\u67d0\u4e2abug\u4e0a\uff0c\u4f46\u5df2\u7ecf\u7f16\u5199\u7684\u5de5\u4f5c\u53c8\u60f3\u4fdd\u7559<\/li>\n<\/ul>\n<h1 id=\"%E7%94%A8%E6%B3%95\" class=\"mume-header\">\u7528\u6cd5<\/h1>\n<pre class=\"language-\" data-role=\"codeBlock\" data-info=\"\"><code>git stash   # \u4fdd\u5b58\u5f53\u524d\u73b0\u573a\u3002\r\ngit stash list # \u67e5\u770b\u5f53\u524dstash\u7f13\u5b58\u7684\u5185\u5bb9\r\n## \u7f16\u8f91\u5176\u4ed6\u5185\u5bb9\uff0c\u7f16\u8f91\u5b8c\u6bd5\u540e\uff0c\u60f3\u56de\u590d\u73b0\u573a\uff1a\r\ngit stash pop # \u5f39\u51fastash\u7f13\u5b58\u6808\u9876\u5185\u5bb9\uff0c\u5373\u53ef\u6062\u590d\u73b0\u573a\r\n<\/code><\/pre>\n<p><!--more--><br \/>\n\u6ce8\u610fstash\u4fdd\u5b58\u6570\u636e\u65f6\uff0c\u5b9e\u9645\u662f\u4e00\u4e2a\u6808\u7ed3\u6784\uff0c\u57fa\u672c\u6bcf\u6b21\u6700\u65b0stash\u8fdb\u53bb\u7684\u6570\u636e\uff0c\u90fd\u4fdd\u5b58\u5728\u6808\u9876\uff0c\u5982\u679c\u7528<code>git stash pop<\/code>\u547d\u4ee4\uff0c\u5f39\u51fa\u7684\u90fd\u662f\u6700\u65b0\u538b\u5165\u7684\u6570\u636e\u3002<\/p>\n<p>\u5982\u679c\u591a\u6b21stash\uff0c\u60f3\u53d6\u51fa\u67d0\u4e00\u6b21\u538b\u5165\u7684\u6570\u636e\uff0c\u53ef\u4ee5\u5148\u7528\u67e5\u770bstash\u7684\u8bb0\u5f55id\uff1a<\/p>\n<pre class=\"language-\" data-role=\"codeBlock\" data-info=\"\"><code>git stash list\r\n<\/code><\/pre>\n<p>\u53ef\u4ee5\u770b\u5230\uff0c<code>git stash list<\/code>\u7684\u7ed3\u679c\u57fa\u672c\u5982\u4e0b\uff1a<\/p>\n<pre class=\"language-\" data-role=\"codeBlock\" data-info=\"\"><code>stash@{0}: WIP on dev: f52c633 add merge\r\nstash@{1}: WIP on dev: d23b633 add feature\r\n<\/code><\/pre>\n<p>\u7136\u540e\u6311\u9009\u54ea\u6b21\u5f39\u51fa\u5373\u53ef\uff1a<\/p>\n<pre class=\"language-\" data-role=\"codeBlock\" data-info=\"\"><code>git stash apply stash@{1}\r\n<\/code><\/pre>\n<p>\u6ce8\u610f<code>git stash apply<\/code>\u547d\u4ee4\u4e0d\u4f1a\u5c06\u6570\u636e\u5f39\u51fa\u3001\u6570\u636e\u4ecd\u4fdd\u5b58\u5728stash\u7f13\u5b58\u4e2d\uff1b<code>git stash pop<\/code>\u5219\u4f1a\u5c06\u6570\u636e\u5f7b\u5e95\u5f39\u51fa\u3002<br \/>\n\u5982\u679c\u8fd0\u7528<code>git stash apply<\/code>\u4e4b\u540e\uff0c\u60f3\u5f7b\u5e95\u5220\u6389\u67d0\u6761\u8bb0\u5f55\uff0c\u53ef\u4ee5\u7528\uff1a<\/p>\n<pre class=\"language-\" data-role=\"codeBlock\" data-info=\"\"><code>git stash drop stash@{1}\r\n<\/code><\/pre>\n<h1 id=\"%E5%8F%82%E8%80%83%E8%B5%84%E6%96%99\" class=\"mume-header\">\u53c2\u8003\u8d44\u6599<\/h1>\n<ul>\n<li><a href=\"https:\/\/www.liaoxuefeng.com\/wiki\/896043488029600\/900388704535136\">\u5ed6\u96ea\u5cf0git\u6559\u7a0b<\/a><\/li>\n<\/ul>\n<\/div>\n<p>&nbsp;<\/p>\n","protected":false},"excerpt":{"rendered":"<p>git stash\u547d\u4ee4\uff1a\u4fdd\u5b58\u73b0\u573a\u3001\u6062\u590d\u73b0\u573a \u529f\u80fd\uff1a\u5c06git \u5de5\u4f5c\u533a\u4e2d\u7684\u6570\u636e\u6682\u5b58\u8d77\u6765\uff0c\u4fdd\u5b58\u73b0\u573a\uff0c\u4ee5\u53ca\u540e\u7eed\u7684\u6062\u590d\u73b0 <a href='http:\/\/prayerlaputa.com\/?p=699' class='excerpt-more'>[&#8230;]<\/a><\/p>\n","protected":false},"author":1,"featured_media":0,"comment_status":"open","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"_monsterinsights_skip_tracking":false,"_monsterinsights_sitenote_active":false,"_monsterinsights_sitenote_note":"","_monsterinsights_sitenote_category":0},"categories":[90],"tags":[61],"_links":{"self":[{"href":"http:\/\/prayerlaputa.com\/index.php?rest_route=\/wp\/v2\/posts\/699"}],"collection":[{"href":"http:\/\/prayerlaputa.com\/index.php?rest_route=\/wp\/v2\/posts"}],"about":[{"href":"http:\/\/prayerlaputa.com\/index.php?rest_route=\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"http:\/\/prayerlaputa.com\/index.php?rest_route=\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"http:\/\/prayerlaputa.com\/index.php?rest_route=%2Fwp%2Fv2%2Fcomments&post=699"}],"version-history":[{"count":2,"href":"http:\/\/prayerlaputa.com\/index.php?rest_route=\/wp\/v2\/posts\/699\/revisions"}],"predecessor-version":[{"id":701,"href":"http:\/\/prayerlaputa.com\/index.php?rest_route=\/wp\/v2\/posts\/699\/revisions\/701"}],"wp:attachment":[{"href":"http:\/\/prayerlaputa.com\/index.php?rest_route=%2Fwp%2Fv2%2Fmedia&parent=699"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"http:\/\/prayerlaputa.com\/index.php?rest_route=%2Fwp%2Fv2%2Fcategories&post=699"},{"taxonomy":"post_tag","embeddable":true,"href":"http:\/\/prayerlaputa.com\/index.php?rest_route=%2Fwp%2Fv2%2Ftags&post=699"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}