{"id":56,"date":"2022-06-06T16:15:34","date_gmt":"2022-06-06T08:15:34","guid":{"rendered":"http:\/\/blog.minegician.cn\/?p=56"},"modified":"2023-01-15T16:58:54","modified_gmt":"2023-01-15T08:58:54","slug":"git%e7%9a%84%e5%ad%a6%e4%b9%a0%e7%ac%94%e8%ae%b0","status":"publish","type":"post","link":"http:\/\/blog.minegician.cn\/?p=56","title":{"rendered":"Git \u5b66\u4e60\u7b14\u8bb0"},"content":{"rendered":"<h3>Git \u4ecb\u7ecd<\/h3>\n<h4>\u603b\u8ff0<\/h4>\n<p>git \u662f\u7528\u6811\u5f62\u7ed3\u6784<strong>\u7ba1\u7406<\/strong>\u7ef4\u62a4\u4ee3\u7801\u5404\u4e2a<strong>\u7248\u672c<\/strong>\u5206\u652f\u7684<strong>\u5de5\u5177<\/strong>\uff0c\u4ee3\u7801\u7684\u8bb0\u5f55\u7c7b\u4f3c\u7ed3\u70b9\u4e00\u822c\u4fdd\u5b58<\/p>\n<p>\u4ece\u5e93\u4e2d\u62ff\u51fa\u4e00\u4e2a\u7248\u672c\u7684\u4ee3\u7801\uff0c\u66f4\u65b0\u540e\u5b58\u6210\u4e00\u4e2a\u65b0\u7ed3\u70b9\uff0c\u53ef\u4ee5\u968f\u65f6\u56de\u6eda \/ \u67e5\u770b\u5386\u53f2\u7248\u672c\uff0c\u4ee5\u53ca\u591a\u4eba\u534f\u4f5c<\/p>\n<h4>\u6982\u5ff5<\/h4>\n<ol>\n<li>\n<p>\u5de5\u4f5c\u533a\uff1a\u4ed3\u5e93\u7684\u76ee\u5f55\u6587\u4ef6\u5939\uff0c\u4e0d\u6d89\u53ca\u5206\u652f<\/p>\n<\/li>\n<li>\n<p>\u6682\u5b58\u533a\uff1a\u6682\u65f6\u5b58\u653e\u6bcf\u4e2a\u6587\u4ef6\u7684\u72b6\u6001\uff0c\u53ef\u8ba4\u4e3a\u662f\u5de5\u4f5c\u533a\u5230\u7248\u672c\u5e93\u7684\u7f13\u5b58\uff0c\u4e0d\u6d89\u53ca\u5206\u652f<\/p>\n<\/li>\n<li>\n<p>\u7248\u672c\u5e93\uff1a\u957f\u671f\u5b58\u653e\u6240\u6709\u5df2\u7ecf\u63d0\u4ea4\u5230\u672c\u5730\u4ed3\u5e93\u7684\u4ee3\u7801\u7248\u672c<\/p>\n<\/li>\n<li>\n<p>\u7248\u672c\u7ed3\u6784\uff1a\u6811\u7ed3\u6784\uff0c\u6811\u4e2d\u6bcf\u4e2a\u8282\u70b9\u4ee3\u8868\u4e00\u4e2a\u4ee3\u7801\u7248\u672c<\/p>\n<\/li>\n<\/ol>\n<blockquote>\n<p>\u53ef\u4ee5\u8ba4\u4e3a\u6811\u968f\u7740\u7248\u672c\u66f4\u65b0\u4e0d\u65ad\u7ef4\u62a4\u9876\u7aef\u7ed3\u70b9 HEAD \u6307\u9488\uff08\u6307\u5411\u4e00\u4e2a\u5206\u652f\u7684\u6700\u65b0\u7248\u672c\uff09<\/p>\n<\/blockquote>\n<h3>Git \u547d\u4ee4<\/h3>\n<h5>\u5168\u5c40\u8bbe\u7f6e<\/h5>\n<pre><code class=\"language-shell\">git config --global user.name \u540d\u5b57    # \u8bbe\u7f6e\u5168\u5c40\u7528\u6237\u540d\uff0c\u4fe1\u606f\u8bb0\u5f55\u5728~\/.gitconfig\u6587\u4ef6\u4e2d\ngit config --global user.email \u90ae\u7bb1   # \u5168\u5c40\u90ae\u7bb1\u5730\u5740\uff0c\u4fe1\u606f\u8bb0\u5f55\u540c\u4e0a\n\ngit init    # \u5c06\u5f53\u524d\u76ee\u5f55\u914d\u7f6e\u6210git\u4ed3\u5e93\uff0c\u4fe1\u606f\u8bb0\u5f55\u5728\u9690\u85cf\u7684.git\u6587\u4ef6\u5939\u4e2d<\/code><\/pre>\n<h4>\u5e38\u7528\u547d\u4ee4<\/h4>\n<pre><code class=\"language-shell\">git add XX  # \u5c06\u6587\u4ef6\u7684\u4fee\u6539\u72b6\u6001\u52a0\u5165\u6682\u5b58\u533a\uff08\u5305\u62ec\u521b\u5efa\uff0c\u4fee\u6539\uff0c\u5220\u9664\uff09\ngit add .   # \u6240\u6709\u672a\u52a0\u5165\u7684\u90fd\u52a0\u5165\n\ngit commit -m &quot;\u5907\u6ce8&quot;    # \u5c06\u6682\u5b58\u533a\u5185\u5bb9\u63d0\u4ea4\u4e3a\u5f53\u524d\u5206\u652f\u7684\u65b0\u7ed3\u70b9\uff08\u540c\u65f6\u6e05\u7a7a\u6682\u5b58\u533a\uff09\n\ngit status  # \u67e5\u770b\u4ed3\u5e93\u72b6\u6001\uff08\u672a\u7ba1\u7406\u6587\u4ef6\uff0c\u672a\u63d0\u4ea4\u6587\u4ef6\uff0c\u6682\u5b58\u533a\u72b6\u6001\u6539\u53d8\u672a\u66f4\u65b0\u7684\u6587\u4ef6\u7b49\uff09\n\ngit diff XX # \u67e5\u770b\u6587\u4ef6\u76f8\u6bd4\u6682\u5b58\u533a\u4fee\u6539\u4e86\u54ea\u4e9b\u5185\u5bb9\n\ngit log # \u67e5\u770b\u5f53\u524d\u5206\u652f\u7684\u6240\u6709\u7248\u672c(\u53ea\u80fd\u770b\u524d\u9762\uff0c\u4e0d\u80fd\u770b\u540e\u9762)\ngit log --pretty=oneline    # \u7528\u4e00\u884c\u6765\u663e\u793a\uff0c\u770b\u8d77\u6765\u6e05\u695a\n\ngit push -u # (\u7b2c\u4e8c\u6b21\u4ee5\u540e\u4e0d\u9700\u8981-u) \u5c06\u5f53\u524d\u5206\u652f\u63a8\u9001\u5230\u8fdc\u7a0b\u4ed3\u5e93\n# -u \u662f --set-upstream \u7684\u7f29\u5199\n\ngit pull    # \u5c06\u8fdc\u7a0b\u4ed3\u5e93\u7684\u5f53\u524d\u5206\u652f\u4e0e\u672c\u5730\u4ed3\u5e93\u7684\u5f53\u524d\u5206\u652f\u5408\u5e76\n# \u6ce8\u610f\u70b9\uff1a\u672c\u5730\u672acommit,\u4e14\u672a\u653e\u5165stash\u7684\u4fee\u6539\u4f1a\u88ab\u8986\u76d6;\u5408\u5e76\u53ef\u80fd\u8981\u5904\u7406\u51b2\u7a81\n\ngit clone git@\u8fdc\u7a0b\u4ed3\u5e93\u57df\u540d:\u8fdc\u7a0b\u8def\u5f84.git   # \u5c06\u8fdc\u7a0b\u4ed3\u5e93XXX\u4e0b\u8f7d\u5230\u5f53\u524d\u76ee\u5f55\u4e0b\n\ngit branch  # \u67e5\u770b\u6240\u6709\u5206\u652f\u548c\u5f53\u524d\u6240\u5904\u5206\u652f<\/code><\/pre>\n<h5>\u67e5\u770b\u547d\u4ee4<\/h5>\n<pre><code class=\"language-shell\">git reflog  # \u67e5\u770bHEAD\u6307\u9488\u7684\u79fb\u52a8\u5386\u53f2(\u66f4\u65b0\u548c\u56de\u6eda)<\/code><\/pre>\n<h5>\u5220\u9664&amp;\u56de\u6eda<\/h5>\n<pre><code class=\"language-shell\">git rm \u6587\u4ef6\u540d  # \u5220\u9664\u5de5\u4f5c\u533a\u548c\u6682\u5b58\u533a\u7684\u6587\u4ef6\n\ngit rm --cached \u6587\u4ef6\u540d # \u4ece\u6682\u5b58\u533a\u91cc\u79fb\u9664\ngit restore --staged \u6587\u4ef6\u540d    # \u4ece\u6682\u5b58\u533a\u91cc\u79fb\u9664\n\ngit restore \u6587\u4ef6\u540d # \u4ece\u6682\u5b58\u533a\u79fb\u51fa\u5e76\u8986\u76d6\u5de5\u4f5c\u533a\n# \u82e5\u6682\u5b58\u533a\u7a7a\uff0c\u5c31\u5c06\u4ed3\u5e93HEAD\u6307\u5411\u7248\u672c\u8986\u76d6\u5230\u5de5\u4f5c\u533a\ngit checkout -- \u6587\u4ef6\u540d # \u540c\u4e0a\uff0c\u8fd9\u4e24\u4e2a\u547d\u4ee4\u8fd8\u53ef\u4ee5\u56de\u6eda\u8bef\u5220\u7684\u6587\u4ef6\n\n# \u53ef\u4ee5\u5c06\u5220\u9664\u540e\u7684\u6682\u5b58\u533acommit\uff0c\u5c31\u4f1a\u5c06\u5220\u9664\u540e\u7684\u7248\u672c\u52a0\u5165\u4ed3\u5e93\n# \u6ce8\u610f\uff0c\u5728\u4f7f\u7528\u4ed3\u5e93\u4ee3\u7801\u65f6\u53ea\u5173\u6ce8HEAD\u5f53\u524d\u6307\u5411\u7684\u7248\u672c\uff0c\u8bf4\u5230\u5e95\u8fd8\u662f\u4e00\u4e2a\u76ee\u5f55\uff0c\u53ea\u662f\u6709\u5f3a\u5927\u7684\u5907\u4efd\u80fd\u529b\n# \u6240\u4ee5\u6240\u8c13\u5220\u9664\u4ed3\u5e93\u5185\u6587\u4ef6\uff0c\u6307\u7684\u662f\u66f4\u65b0\u4e00\u4e2a\u5220\u9664\u540e\u72b6\u6001\u7684\u7248\u672c<\/code><\/pre>\n<blockquote>\n<p>\u7406\u89e3\uff1a\u5de5\u4f5c\u533a\u662f\u672c\u5730\u7684\u5de5\u4f5c\u6587\u4ef6\uff0c\u628a\u6587\u4ef6\u5e0c\u671b\u88ab\u4fdd\u5b58\u7684\u72b6\u6001\u653e\u5728\u6682\u5b58\u533a\uff0c\u6700\u540e\u5c06\u6682\u5b58\u533a\u4f20\u5230\u4ed3\u5e93\u4e2d\u4fdd\u5b58\u4e3a\u4e00\u4e2a\u7248\u672c\u5907\u4efd<\/p>\n<\/blockquote>\n<pre><code class=\"language-shell\"># \u52a0\u4e0a --hard \u540e\uff0c\u56de\u6eda\u4f1a\u5220\u9664\u4ed3\u5e93\u65b0\u7248\u672c\uff0c\u540c\u65f6\u628a\u5de5\u4f5c\u533a\u6587\u4ef6\u4e5f\u56de\u6eda\u5230\u6307\u5b9a\u7248\u672c\ngit reset --hard HEAD^  # \u4e00\u4e2a^\u4ee3\u8868\u5f80\u4e0a\u56de\u6eda\u4e00\u4e2a\u7248\u672c(HEAD\u6307\u9488\u79fb\u52a8\uff0c\u56de\u9000\u672c\u5730\u4ed3\u5e93)\n\ngit reset --hard HEAD~  # \u4ee3\u7801\u5e93\u56de\u6eda\u5230\u4e0a\u4e00\u4e2a\u7248\u672c\ngit reset --hard HEAD~100   # \u540e\u9762\u52a0\u6570\u5b57\u8868\u793a\u56de\u6eda\u6b21\u6570\n\ngit reset --hard \u7248\u672c\u53f7    # (\u5411\u524d\u6216\u5411\u540e)\u8df3\u8f6c\u5230\u67d0\u4e00\u7279\u5b9a\u7248\u672c\uff0c\u7248\u672c\u53f7\u662freflog\u524d\u7684\u54c8\u5e0c\u503c\n\n# \u6ca1\u6709 --hard \u65f6\uff0c\u56de\u6eda\u53d8\u6210\u76f4\u63a5\u5f80\u56de\u79fb\u52a8 HEAD \u6307\u9488\uff0c\u4e0d\u4f1a\u771f\u6b63\u5220\u6389\u7248\u672c\u3002\u800c\u5de5\u4f5c\u533a\u4e0d\u4f1a\u81ea\u52a8\u6539\u53d8\uff0c\u9700\u8981\u624b\u52a8 checkout\ngit reset   # \u5176\u4ed6\u7528\u6cd5\u76f8\u540c<\/code><\/pre>\n<h4>\u8fdc\u7a0b\u4ed3\u5e93<\/h4>\n<p>\u8fdc\u7a0b\u4ee3\u7ba1\u80fd\u907f\u514d\u672c\u5730\u4ed3\u5e93\u610f\u5916\u4e22\u5931\u7684\u60c5\u51b5\uff0c\u6709\u7684\u8fd8\u63d0\u4f9b\u56fe\u5f62\u5316\u754c\u9762\uff0c\u76f4\u89c2\u663e\u793a\u7248\u672c\u5206\u652f\u6811<\/p>\n<blockquote>\n<p>\u672c\u5730\u7684 <code>.git<\/code> \u76ee\u5f55\u5185\u5c31\u5305\u542b\u672c\u5730\u4ed3\u5e93\uff0c\u4ee3\u7801\u7684\u4fee\u6539\u8bb0\u5f55\u548c\u7248\u672c\u90fd\u5728\u5176\u4e2d<\/p>\n<p>\u7c7b\u4f3c\u7684\uff0c\u8981\u53d6\u5f97\u7684\u4e91\u7aef\u4ed3\u5e93\uff0c\u8def\u5f84\u540e\u4e5f\u6709\u4e00\u4e2a <code>.git<\/code> \u540e\u7f00<\/p>\n<\/blockquote>\n<pre><code class=\"language-shell\">git remote add origin ssh\u90ae\u7bb1:\u4ed3\u5e93\u8def\u5f84.git    # \u5c06\u672c\u5730\u4ed3\u5e93\u5173\u8054\u5230\u8fdc\u7a0b\u4ed3\u5e93\n# origin \u662f\u60ef\u7528\u7684\u8fdc\u7a0b\u4ed3\u5e93\u540d\uff0c\u5728\u8fdc\u7a0b\u6709\u4e00\u4e2a\u540d\u53eborigin\u7684\u4ed3\u5e93\u4e0e\u672c\u5730\u5bf9\u5e94\uff0c\u4e0b\u9762\u90fd\u7528origin\u4ee3\u79f0\n\ngit push -u origin master   # (\u9996\u6b21)\u63a8\u9001\u5f53\u524d\u5206\u652f\u5230\u8fdc\u7a0b\u4ed3\u5e93\uff0cmaster\u4e3a\u9ed8\u8ba4\u5206\u652f\ngit push    # (\u7b2c\u4e8c\u6b21\u5f00\u59cb)\u63a8\u9001\u5f53\u524d\u5206\u652f\u5230\u8fdc\u7a0b\u4ed3\u5e93\ngit push -u origin \u5206\u652f\u540d  # \u5c06\u67d0\u4e2a\u5206\u652f\u63a8\u9001\u5230\u8fdc\u7a0b\u4ed3\u5e93<\/code><\/pre>\n<blockquote>\n<p>\u4e91\u7aef\u4e0a\u53ef\u4ee5\u76f4\u89c2\u5730\u67e5\u770b\u63d0\u4ea4\u8bb0\u5f55\uff0c\u53ef\u4ee5\u70b9\u9009\u7248\u672c\uff0c\u6d4f\u89c8\u4ee3\u7801\u6216\u56de\u6eda<\/p>\n<p>\u514b\u9686\u5230\u672c\u5730\u7684\u6587\u4ef6\u80fd\u4fdd\u6301\u6811\u5f62\u7ed3\u6784\uff0c\u4f46\u6ca1\u6709 HEAD \u7684\u79fb\u52a8\u65e5\u5fd7<\/p>\n<\/blockquote>\n<pre><code class=\"language-shell\">git clone ssh\u90ae\u7bb1:\u4ed3\u5e93\u8def\u5f84.git    # \u5c06\u8fdc\u7a0b\u4ed3\u5e93\u4e0b\u8f7d\u5230\u5f53\u524d\u76ee\u5f55\n\ngit push --set-upstream \u8fdc\u7a0b\u4ed3\u5e93\u540d \u5206\u652f    # \u4f7f\u672c\u5730\u7684\u8be5\u5206\u652f\u5bf9\u5e94\u8fdc\u7a0b\u4ed3\u5e93\u7684\u540c\u540d\u5206\u652f\ngit push -d origin \u5206\u652f   # \u5220\u9664\u8fdc\u7a0b\u4ed3\u5e93\u7684\u67d0\u4e2a\u5206\u652f\n\ngit checkout -t origin\/\u5206\u652f   # \u5c06\u8fdc\u7a0b\u7684\u67d0\u4e2a\u5206\u652f\u62c9\u53d6\u5230\u672c\u5730\n\ngit pull    # \u5c06\u8fdc\u7a0b\u4ed3\u5e93\u7684\u5f53\u524d\u5206\u652f\u4e0e\u672c\u5730\u4ed3\u5e93\u7684\u5f53\u524d\u5206\u652f\u5408\u5e76\ngit pull origin \u5206\u652f  # \u5c06\u8fdc\u7a0b\u4ed3\u5e93\u7684\u67d0\u4e2a\u5206\u652f\u4e0e\u672c\u5730\u4ed3\u5e93\u5f53\u524d\u5206\u652f\u5408\u5e76\n\ngit branch --set-upstream-to=origin\/\u5206\u652fA \u5206\u652fB # \u5c06\u8fdc\u7a0b\u7684\u5206\u652fA\u4e0e\u672c\u5730\u7684\u5206\u652fB\u5bf9\u5e94<\/code><\/pre>\n<h4>\u5206\u652f<\/h4>\n<p>\u9ed8\u8ba4\uff08\u4e3b\uff09\u5206\u652f\u662f master\uff0c\u591a\u5206\u652f\u4f1a\u7528\u4e8e\u66f4\u590d\u6742\u7684\u7248\u672c\u6811\uff0c\u591a\u7528\u5728\u591a\u4eba\u5f00\u53d1\u7684\u60c5\u51b5<\/p>\n<blockquote>\n<p>\u521b\u5efa\u5206\u652f\u76f8\u5f53\u4e8e\u65b0\u7684\u5934\u7ed3\u70b9\uff0c\u8fd8\u6ca1\u6709\u4e00\u6761\u5b9e\u4f53\u5206\u652f\uff0c\u4f46\u5206\u652f\u786e\u5b9e\u5b58\u5728\uff0ccommit \u540e\u624d\u4f1a\u5f62\u6210\u3002<\/p>\n<p>\u6574\u4e2a\u6811\u5171\u7528\u6682\u5b58\u533a\u548c\u5de5\u4f5c\u533a<\/p>\n<p>\u672c\u7b14\u8bb0\u4e2d\u7684\u6d89\u53ca HEAD \u79fb\u52a8\u7684\u547d\u4ee4\u90fd\u4f1a\u6539\u53d8\u5de5\u4f5c\u533a\u5185\u5bb9\uff0c\u6b64\u5916\u6709\u4e9b\u547d\u4ee4\u53ef\u4ee5\u4e0d\u6539\u53d8\u5de5\u4f5c\u533a<\/p>\n<\/blockquote>\n<pre><code class=\"language-shell\">git branch \u5206\u652f\u540d  # \u521b\u5efa\u65b0\u5206\u652f\n\ngit branch  # \u67e5\u770b\u6240\u6709\u5206\u652f\u548c\u5f53\u524d\u6240\u5904\u5206\u652f(*)\n\ngit checkout -b \u5206\u652f  # \u521b\u5efa\u5e76\u5207\u6362\u5230\u8fd9\u4e2a\u5206\u652f\uff0c\u7b49\u4e8ebranch + checkout\ngit checkout \u5206\u652f\u540d    # \u5207\u6362\u5230\u5206\u652f\n\ngit merge \u5206\u652f\u540d   # \u5c06\u5206\u652f\u5408\u5e76\u5230\u5f53\u524d\u5206\u652f\u4e0a\n# \u5982\u679c\u5f53\u524d\u5206\u652f HEAD \u4e0d\u662f\u5f15\u51fa\u652f\u8def\u7684\u70b9\uff0c\u5408\u5e76\u4f1a\u6709\u51b2\u7a81\uff0c\u9700\u8981\u5904\u7406\u51b2\u7a81\uff0c\u4e4b\u540e\u5206\u652f\u4e0a\u4fdd\u5b58\u5904\u7406\u540e\u7684\u7248\u672c\n# \u5408\u5e76\u6210\u529f\u540e\u4f1a\u76f4\u63a5\u5f71\u54cd\u5f53\u524d\u5de5\u4f5c\u533a\u7684\u6587\u4ef6\n\ngit branch -d \u5206\u652f\u540d   # \u5220\u9664\u672c\u5730\u4ed3\u5e93\u7684\u6b64\u5206\u652f\uff08\u7c7b\u4f3c\u91ca\u653e\u5934\u7ed3\u70b9\uff0c\u5982\u679c\u6ca1\u6709\u5408\u5e76\u5c31\u5220\u9664\u4f1a\u63d0\u9192\uff09\n\ngit push --set-upstream origin \u5206\u652f\u540d  # \u5c06\u8fdc\u7a0b\u7684\u67d0\u5206\u652f\u4e0e\u672c\u5730\u5f53\u524d\u5206\u652f\u5bf9\u5e94\uff0c\u6ca1\u6709\u5c31\u521b\u5efa\n# push\u7684\u65f6\u5019\u5bf9\u5e94\u8054\u7cfb\uff0c\u4f46\u5e73\u65f6\u6570\u636e\u662f\u72ec\u7acb\u7684\uff0c\u800c\u4e14\u540d\u5b57\u53ef\u4ee5\u4e0d\u540c\ngit branch --set-upstream-to=origin\/\u5206\u652fA \u5206\u652fB # \u5c06\u8fdc\u7a0b\u7684\u5206\u652fA\u4e0e\u672c\u5730\u7684\u5206\u652fB\u5bf9\u5e94\n\ngit push -d origin \u5206\u652f   # \u5220\u9664\u8fdc\u7a0b\u4ed3\u5e93\u7684\u67d0\u4e2a\u5206\u652f\n\ngit checkout -t origin\/\u5206\u652f\u540d  # \u5c06\u8fdc\u7a0b\u7684\u67d0\u5206\u652f\u62c9\u53d6\u5230\u672c\u5730\ngit pull    # \u5c06\u8fdc\u7a0b\u4ed3\u5e93\u7684 \u5bf9\u5e94\u5206\u652f \u8986\u76d6\u5230\u672c\u5730\u4ed3\u5e93\u7684\u5f53\u524d\u5206\u652f\n# \u518d git checkout \u5c31\u53ef\u4ee5\u8986\u76d6\u5230\u5de5\u4f5c\u533a\ngit pull origin \u5206\u652f\u540d # \u5c06\u8fdc\u7a0b\u4ed3\u5e93\u7684 \u6307\u5b9a\u5206\u652f \u8986\u76d6\u5230\u672c\u5730\u4ed3\u5e93\u5f53\u524d\u5206\u652f<\/code><\/pre>\n<blockquote>\n<ol>\n<li>\u8de8\u7aef\u7684\u5408\u5e76\uff0c\u8868\u73b0\u51fa\u6765\u5c31\u662f\u8986\u76d6<\/li>\n<li>\u4e91\u7aef\u4ed3\u5e93\u5185\u90e8\u5408\u5e76\u53ef\u7531\u9f20\u6807\u5b8c\u6210\uff0c\u7565\u8fc7<\/li>\n<\/ol>\n<\/blockquote>\n<hr \/>\n<ul>\n<li>\u5b66\u5b8c\u4ee5\u4e0a\u5185\u5bb9\u540e\uff0c\u770b\u770b\u8fd9\u5f20\u56fe\u52a0\u6df1\u7406\u89e3<\/li>\n<\/ul>\n<p><div class='fancybox-wrapper lazyload-container-unload' data-fancybox='post-images' href='https:\/\/img-blog.csdnimg.cn\/fa191e879d4449fbb7fcd469953a4623.png'><img class=\"lazyload lazyload-style-1\" src=\"data:image\/svg+xml;base64,PCEtLUFyZ29uTG9hZGluZy0tPgo8c3ZnIHdpZHRoPSIxIiBoZWlnaHQ9IjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgc3Ryb2tlPSIjZmZmZmZmMDAiPjxnPjwvZz4KPC9zdmc+\"  decoding=\"async\" data-original=\"https:\/\/img-blog.csdnimg.cn\/fa191e879d4449fbb7fcd469953a4623.png\" src=\"data:image\/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsQAAA7EAZUrDhsAAAANSURBVBhXYzh8+PB\/AAffA0nNPuCLAAAAAElFTkSuQmCC\" alt=\"img\" \/><\/div><\/p>\n<h5>stash\u6682\u5b58\uff08\u4f7f\u7528\u573a\u5408\u8f83\u5c11\uff09<\/h5>\n<pre><code class=\"language-shell\">git stash   # \u5c06\u5de5\u4f5c\u533a\u548c\u6682\u5b58\u533a\u4e2d\u5c1a\u672a\u63d0\u4ea4\u7684\u4fee\u6539\u5b58\u5165stash\u4e2d\n\ngit stash apply # \u5c06stash\u5b58\u50a8\u7684\u4fee\u6539\u6062\u590d\u5230\u5f53\u524d\u5206\u652f\uff0c\u4f46\u4e0d\u5220\u9664\u5143\u7d20\ngit stash drop  # \u5220\u9664\u5b58\u50a8\u7684\u4fee\u6539\ngit stash pop   # \u5c06\u5b58\u50a8\u7684\u4fee\u6539\u6062\u590d\u5230\u5f53\u524d\u5206\u652f\uff0c\u540c\u65f6\u5220\u9664\u5143\u7d20\n\ngit stash list  # \u67e5\u770bstash\u4e2d\u6240\u6709\u5143\u7d20<\/code><\/pre>\n<blockquote>\n<ul>\n<li>\n<p>\u53ef\u80fd\u7684\u4f7f\u7528\u573a\u666f\uff1a<\/p>\n<ol>\n<li>\n<p>\u4e00\u4e2a\u65b0\u5206\u652f\uff0c\u6587\u4ef6\u7684 commit \u8fdb\u884c\u4e00\u534a\u65f6\u610f\u5916\u65ad\u7535\uff0c\u5bfc\u81f4\u90e8\u5206\u5185\u5bb9\u672a commit\u3002\u4e3b\u673a\u6062\u590d\u540e\uff0c\u5e0c\u671b\u91cd\u65b0\u63d0\u4ea4\u4e3a\u65b0\u5206\u652f\u7ed3\u70b9<\/p>\n<p>\u6b64\u65f6\u5c06\u672a\u63d0\u4ea4\u7684\u6587\u4ef6\u52a0\u5165 stash\uff0c\u518d\u5c06\u5df2\u7ecf\u63d0\u4ea4\u7684\u90e8\u5206\u5408\u5e76\u5165\u4e3b\u5206\u652f\uff0c\u4e0d\u5f71\u54cd stash \u5185\u7684\u6587\u4ef6\uff0c\u518d\u65b0\u5f00\u4e00\u4e2a\u5206\u652f\u8fdb\u884c\u65b0\u7684 commit<\/p>\n<\/li>\n<li>\n<p>\u5de5\u4f5c\u533a\u8fc1\u79fb\uff0c\u6216\u662f\u64cd\u4f5c\u95ee\u9898\u5bfc\u81f4\u7248\u672c\u4e0d\u540c\u6b65\uff0c\u6b64\u65f6\u65b0\u7684\u4fee\u6539\u672a commit\uff0c\u53ef\u4ee5\u52a0\u5165 stash\uff0c\u5f85\u5176\u4ed6\u5185\u5bb9\u5408\u5e76\u3001\u540c\u6b65\u7248\u672c\u540e\u518d\u53d6\u51fa<\/p>\n<\/li>\n<\/ol>\n<\/li>\n<\/ul>\n<\/blockquote>\n","protected":false},"excerpt":{"rendered":"<p>Git \u4ecb\u7ecd \u603b\u8ff0 git \u662f\u7528\u6811\u5f62\u7ed3\u6784\u7ba1\u7406\u7ef4\u62a4\u4ee3\u7801\u5404\u4e2a\u7248\u672c\u5206\u652f\u7684\u5de5\u5177\uff0c\u4ee3\u7801\u7684\u8bb0\u5f55\u7c7b\u4f3c\u7ed3\u70b9\u4e00\u822c\u4fdd\u5b58 \u4ece\u5e93\u4e2d\u62ff\u51fa [&hellip;]<\/p>\n","protected":false},"author":1,"featured_media":128,"comment_status":"open","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"footnotes":""},"categories":[3],"tags":[],"class_list":["post-56","post","type-post","status-publish","format-standard","has-post-thumbnail","hentry","category-3"],"_links":{"self":[{"href":"http:\/\/blog.minegician.cn\/index.php?rest_route=\/wp\/v2\/posts\/56","targetHints":{"allow":["GET"]}}],"collection":[{"href":"http:\/\/blog.minegician.cn\/index.php?rest_route=\/wp\/v2\/posts"}],"about":[{"href":"http:\/\/blog.minegician.cn\/index.php?rest_route=\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"http:\/\/blog.minegician.cn\/index.php?rest_route=\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"http:\/\/blog.minegician.cn\/index.php?rest_route=%2Fwp%2Fv2%2Fcomments&post=56"}],"version-history":[{"count":6,"href":"http:\/\/blog.minegician.cn\/index.php?rest_route=\/wp\/v2\/posts\/56\/revisions"}],"predecessor-version":[{"id":138,"href":"http:\/\/blog.minegician.cn\/index.php?rest_route=\/wp\/v2\/posts\/56\/revisions\/138"}],"wp:featuredmedia":[{"embeddable":true,"href":"http:\/\/blog.minegician.cn\/index.php?rest_route=\/wp\/v2\/media\/128"}],"wp:attachment":[{"href":"http:\/\/blog.minegician.cn\/index.php?rest_route=%2Fwp%2Fv2%2Fmedia&parent=56"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"http:\/\/blog.minegician.cn\/index.php?rest_route=%2Fwp%2Fv2%2Fcategories&post=56"},{"taxonomy":"post_tag","embeddable":true,"href":"http:\/\/blog.minegician.cn\/index.php?rest_route=%2Fwp%2Fv2%2Ftags&post=56"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}