\u5728\u8f6f\u4ef6\u5f00\u53d1\u8fc7\u7a0b\u4e2d\uff0c\u6211\u4eec\u7ecf\u5e38\u9700\u8981\u4fee\u6539\u4ee3\u7801\u6765\u6ee1\u8db3\u9879\u76ee\u9700\u6c42\u3002\u800c\u5728\u4e00\u4e2a\u7248\u672c\u63a7\u5236\u7cfb\u7edf\u4e2d\uff0c\u5982git\uff0c\u6211\u4eec\u53ef\u4ee5\u8f7b\u677e\u5730\u521b\u5efa\u548c\u4fdd\u5b58\u6bcf\u4e00\u4e2a\u7248\u672c\u7684\u4ee3\u7801\uff0c\u4ee5\u4fbf\u968f\u65f6\u56de\u6eaf\u548c\u6062\u590d\u4ee3\u7801\u72b6\u6001\u3002\u4f46\u6709\u65f6\u5019\uff0c\u6211\u4eec\u9700\u8981\u5728\u4e00\u4e2a\u7248\u672c\u7684\u4ee3\u7801\u4e0a\u8fdb\u884c\u4e34\u65f6\u7684\u4fee\u6539\uff0c\u800c\u8fd9\u4e9b\u4fee\u6539\u53c8\u4e0d\u503c\u5f97\u88ab\u63d0\u4ea4\u5230\u7248\u672c\u5e93\u4e2d\u3002\u8fd9\u65f6\uff0c\u6211\u4eec\u5c31\u9700\u8981\u638c\u63e1\u4e00\u4e9bgit\u6280\u5de7\u6765\u4e34\u65f6\u6539\u53d8\u4ee3\u7801\u3002<\/p>\n
\u4e00\u3001\u4f7f\u7528stash\u547d\u4ee4<\/p>\n
stash\u547d\u4ee4\u53ef\u4ee5\u628a\u5f53\u524d\u4fee\u6539\u7684\u4ee3\u7801\u4fdd\u5b58\u5230\u4e00\u4e2a\u6682\u5b58\u533a\uff0c\u4ee5\u4fbf\u6211\u4eec\u6267\u884c\u5176\u4ed6\u64cd\u4f5c\u65f6\uff0c\u53ef\u4ee5\u968f\u65f6\u6062\u590d\u5230\u8fd9\u4e2a\u6682\u5b58\u533a\u3002\u6211\u4eec\u53ef\u4ee5\u901a\u8fc7\u4ee5\u4e0b\u547d\u4ee4\u5c06\u5f53\u524d\u7684\u4fee\u6539\u4fdd\u5b58\u5230stash\u4e2d\uff1a<\/p>\n
$ git stash<\/pre>\n\u767b\u5f55\u540e\u590d\u5236 <\/p>\n
\u5f53\u6211\u4eec\u9700\u8981\u6062\u590d\u5230\u8fd9\u4e2a\u4ee3\u7801\u4fee\u6539\u65f6\uff0c\u53ef\u4ee5\u4f7f\u7528\u4ee5\u4e0b\u547d\u4ee4\uff1a<\/p>\n
$ git stash apply<\/pre>\n\u767b\u5f55\u540e\u590d\u5236 <\/p>\n
\u8be5\u547d\u4ee4\u4f1a\u628a\u6700\u8fd1\u7684stash\u6062\u590d\u5230\u5f53\u524d\u4ee3\u7801\u4e2d\uff0c\u5982\u679c\u6709\u591a\u4e2astash\u7684\u8bdd\uff0c\u53ef\u4ee5\u4f7f\u7528stash@{x}\u6765\u6307\u5b9a\u3002<\/p>\n
\u5982\u679c\u6211\u4eec\u9700\u8981\u540c\u65f6\u4fdd\u5b58\u5f53\u524d\u7684\u6682\u5b58\u533a\u548c\u5de5\u4f5c\u533a\u7684\u4fee\u6539\uff0c\u53ef\u4ee5\u4f7f\u7528\u4ee5\u4e0b\u547d\u4ee4\uff1a<\/p>\n
$ git stash save 'message'<\/pre>\n\u767b\u5f55\u540e\u590d\u5236 <\/p>\n
\u5176\u4e2d\uff0cmessage\u662f\u4fdd\u5b58\u7684stash\u7684\u6ce8\u91ca\u3002<\/p>\n
\u4e8c\u3001\u4f7f\u7528reset\u547d\u4ee4<\/p>\n
reset\u547d\u4ee4\u53ef\u4ee5\u6e05\u7a7a\u6682\u5b58\u533a\u6216\u5c06\u67d0\u4e2a\u6587\u4ef6\u6062\u590d\u5230\u67d0\u4e2a\u7248\u672c\u72b6\u6001\u3002\u6211\u4eec\u53ef\u4ee5\u4f7f\u7528\u4ee5\u4e0b\u547d\u4ee4\u5c06\u67d0\u4e2a\u6587\u4ef6\u6062\u590d\u5230\u4e0a\u4e00\u4e2a\u63d0\u4ea4\u7248\u672c\u7684\u72b6\u6001\uff1a<\/p>\n
$ git reset HEAD <file><\/file><\/pre>\n\u767b\u5f55\u540e\u590d\u5236 <\/p>\n
\u5982\u679c\u9700\u8981\u6062\u590d\u6574\u4e2a\u5de5\u4f5c\u533a\u5230\u4e0a\u4e00\u4e2a\u63d0\u4ea4\u7248\u672c\u7684\u72b6\u6001\uff0c\u53ef\u4ee5\u4f7f\u7528\u4ee5\u4e0b\u547d\u4ee4\uff1a<\/p>\n
$ git reset --hard HEAD<\/pre>\n\u767b\u5f55\u540e\u590d\u5236 <\/p>\n
\u8fd9\u4f1a\u6e05\u7a7a\u6682\u5b58\u533a\u548c\u5de5\u4f5c\u533a\u6240\u6709\u7684\u4fee\u6539\u3002<\/p>\n
\u5982\u679c\u9700\u8981\u6062\u590d\u5230\u67d0\u4e2a\u6307\u5b9a\u7684\u7248\u672c\uff0c\u53ef\u4ee5\u4f7f\u7528\u4ee5\u4e0b\u547d\u4ee4\uff1a<\/p>\n
$ git reset --hard <commit><\/commit><\/pre>\n\u767b\u5f55\u540e\u590d\u5236 <\/p>\n
\u8fd9\u4f1a\u5c06\u5de5\u4f5c\u533a\u6062\u590d\u5230\u6307\u5b9a\u7684\u63d0\u4ea4\u7248\u672c\u72b6\u6001\u3002<\/p>\n
\u9700\u8981\u6ce8\u610f\u7684\u662f\uff0creset\u547d\u4ee4\u4f1a\u5f3a\u5236\u6e05\u7a7a\u6682\u5b58\u533a\u548c\u5de5\u4f5c\u533a\u7684\u5185\u5bb9\uff0c\u6240\u4ee5\u8981\u7279\u522b\u5c0f\u5fc3\u4f7f\u7528\u3002<\/p>\n
\u4e09\u3001\u4f7f\u7528checkout\u547d\u4ee4<\/p>\n
checkout\u547d\u4ee4\u53ef\u4ee5\u5c06\u67d0\u4e2a\u6587\u4ef6\u7684\u4fee\u6539\u8fd8\u539f\u5230\u6307\u5b9a\u7684\u7248\u672c\u72b6\u6001\uff0c\u4f46\u662f\u4e0d\u4f1a\u5220\u9664\u6682\u5b58\u533a\u548c\u63d0\u4ea4\u5386\u53f2\u3002\u4ee5\u4e0b\u662f\u5982\u4f55\u4f7f\u7528checkout\u547d\u4ee4\u5c06\u67d0\u4e2a\u6587\u4ef6\u6062\u590d\u5230\u4e0a\u4e00\u4e2a\u63d0\u4ea4\u7248\u672c\u7684\u72b6\u6001\uff1a<\/p>\n
$ git checkout -- <file><\/file><\/pre>\n\u767b\u5f55\u540e\u590d\u5236 <\/p>\n
\u8fd9\u4f1a\u5c06\u6587\u4ef6\u6062\u590d\u5230\u4e0a\u4e00\u4e2a\u63d0\u4ea4\u7248\u672c\u7684\u72b6\u6001\uff0c\u4e5f\u5c31\u662f\u4e0d\u5e26\u4fee\u6539\u7684\u72b6\u6001\u3002<\/p>\n
\u5982\u679c\u9700\u8981\u6062\u590d\u5230\u67d0\u4e2a\u6307\u5b9a\u7684\u7248\u672c\uff0c\u53ef\u4ee5\u4f7f\u7528\u4ee5\u4e0b\u547d\u4ee4\uff1a<\/p>\n
$ git checkout <commit> -- <file><\/file><\/commit><\/pre>\n\u767b\u5f55\u540e\u590d\u5236 <\/p>\n
\u8fd9\u4f1a\u5c06\u6587\u4ef6\u6062\u590d\u5230\u6307\u5b9a\u7684\u63d0\u4ea4\u7248\u672c\u72b6\u6001\u3002<\/p>\n
\u9700\u8981\u6ce8\u610f\u7684\u662f\uff0ccheckout\u547d\u4ee4\u76f4\u63a5\u8986\u76d6\u4e86\u5f53\u524d\u6587\u4ef6\u7684\u5185\u5bb9\uff0c\u6240\u4ee5\u8981\u7279\u522b\u5c0f\u5fc3\u4f7f\u7528\u3002<\/p>\n
\u56db\u3001\u4f7f\u7528\u5206\u652f<\/p>\n
\u6211\u4eec\u4e5f\u53ef\u4ee5\u4f7f\u7528Git\u7684\u5206\u652f\u673a\u5236\u6765\u5bf9\u4ee3\u7801\u8fdb\u884c\u4e34\u65f6\u4fee\u6539\uff0c\u4e0d\u5f71\u54cd\u4e3b\u5206\u652f\u7684\u4ee3\u7801\u3002\u6211\u4eec\u9700\u8981\u5728\u5f53\u524d\u4ee3\u7801\u7684\u72b6\u6001\u4e0b\u521b\u5efa\u4e00\u4e2a\u65b0\u7684\u5206\u652f\uff0c\u7136\u540e\u5728\u8fd9\u4e2a\u5206\u652f\u4e0a\u8fdb\u884c\u4fee\u6539\u3002\u5982\u4e0b\u6240\u793a\uff0c\u6211\u4eec\u4ece\u5f53\u524d\u5206\u652fcheckout\u51fa\u4e00\u4e2a\u65b0\u7684\u5206\u652f\uff0c\u7136\u540e\u5728\u8fd9\u4e2a\u5206\u652f\u4e0a\u8fdb\u884c\u4fee\u6539\uff1a<\/p>\n
$ git checkout -b new_brach\n... \/\/ \u5728\u65b0\u5206\u652f\u4e0a\u8fdb\u884c\u4fee\u6539<\/pre>\n\u767b\u5f55\u540e\u590d\u5236 <\/p>\n
\u5982\u679c\u9700\u8981\u56de\u5230\u4e3b\u5206\u652f\u7684\u4ee3\u7801\uff0c\u53ef\u4ee5\u4f7f\u7528\u4ee5\u4e0b\u547d\u4ee4\uff1a<\/p>\n
$ git checkout master<\/pre>\n\u767b\u5f55\u540e\u590d\u5236 <\/p>\n
\u8fd9\u4f1a\u628a\u6211\u4eec\u5207\u6362\u56de\u5230\u4e3b\u5206\u652f\u4e0a\uff0c\u800c\u65b0\u5206\u652f\u4e0a\u7684\u4ee3\u7801\u4ecd\u7136\u4fdd\u6301\u4e0d\u53d8\u3002<\/p>\n
\u5f53\u6211\u4eec\u5b8c\u6210\u4e86\u5bf9\u4ee3\u7801\u7684\u4fee\u6539\u540e\uff0c\u53ef\u4ee5\u5408\u5e76\u65b0\u5206\u652f\u5230\u4e3b\u5206\u652f\u4e0a\uff0c\u4ee5\u4fbf\u4fdd\u7559\u4ee3\u7801\u4fee\u6539\uff1a<\/p>\n
$ git checkout master\n$ git merge new_branch<\/pre>\n\u767b\u5f55\u540e\u590d\u5236 <\/p>\n
\u8fd9\u6837\uff0c\u6211\u4eec\u7684\u4ee3\u7801\u4fee\u6539\u5c31\u987a\u5229\u5730\u88ab\u4fdd\u5b58\u4e86\u4e0b\u6765\u3002<\/p>\n
\u603b\u7ed3<\/p>\n
Git\u63d0\u4f9b\u4e86\u5f88\u591a\u65b9\u5f0f\u6765\u4fdd\u5b58\u4e34\u65f6\u7684\u4ee3\u7801\u4fee\u6539\u3002\u4f7f\u7528stash\u547d\u4ee4\u53ef\u4ee5\u5feb\u901f\u4fdd\u5b58\u5f53\u524d\u4fee\u6539\uff0c\u4f7f\u7528reset\u547d\u4ee4\u53ef\u4ee5\u6e05\u7a7a\u6682\u5b58\u533a\u548c\u5de5\u4f5c\u533a\u6216\u91cd\u65b0\u6062\u590d\u5230\u67d0\u4e2a\u7248\u672c\u72b6\u6001\uff0c\u4f7f\u7528checkout\u547d\u4ee4\u53ef\u4ee5\u6062\u590d\u5355\u4e2a\u6587\u4ef6\u7684\u4fee\u6539\uff0c\u4f7f\u7528\u5206\u652f\u53ef\u4ee5\u5728\u4e0d\u5f71\u54cd\u4e3b\u5206\u652f\u7684\u60c5\u51b5\u4e0b\uff0c\u5bf9\u4ee3\u7801\u8fdb\u884c\u4fee\u6539\u548c\u4fdd\u5b58\u3002\u6211\u4eec\u9700\u8981\u6839\u636e\u5b9e\u9645\u60c5\u51b5\u9009\u62e9\u6700\u5408\u9002\u7684\u65b9\u5f0f\u6765\u4e34\u65f6\u6539\u53d8\u4ee3\u7801\uff0c\u4ee5\u4fbf\u66f4\u597d\u5730\u7ba1\u7406\u6211\u4eec\u7684\u9879\u76ee\u4ee3\u7801\u3002<\/p>\n
\u4ee5\u4e0a\u5c31\u662fgit\u4e34\u65f6\u6539\u4ee3\u7801\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":"
\u5728\u8f6f\u4ef6\u5f00\u53d1\u8fc7\u7a0b\u4e2d\uff0c\u6211\u4eec\u7ecf\u5e38\u9700\u8981\u4fee\u6539\u4ee3\u7801\u6765\u6ee1\u8db3\u9879\u76ee\u9700\u6c42\u3002\u800c\u5728\u4e00\u4e2a\u7248\u672c\u63a7\u5236\u7cfb\u7edf\u4e2d\uff0c\u5982git\uff0c\u6211\u4eec\u53ef\u4ee5\u8f7b\u677e\u5730\u521b\u5efa\u548c\u4fdd\u5b58\u6bcf\u4e00\u4e2a\u7248\u672c\u7684\u4ee3\u7801\uff0c\u4ee5\u4fbf\u968f\u65f6\u56de\u6eaf\u548c\u6062\u590d\u4ee3\u7801\u72b6\u6001\u3002\u4f46\u6709\u65f6\u5019\uff0c\u6211\u4eec\u9700\u8981\u5728\u4e00\u4e2a\u7248\u672c\u7684\u4ee3\u7801\u4e0a\u8fdb\u884c\u4e34\u65f6\u7684\u4fee\u6539\uff0c\u800c\u8fd9\u4e9b\u4fee\u6539\u53c8\u4e0d\u503c\u5f97\u88ab\u63d0\u4ea4\u5230\u7248\u672c\u5e93\u4e2d\u3002\u8fd9\u65f6\uff0c\u6211\u4eec\u5c31\u9700\u8981\u638c\u63e1\u4e00\u4e9bgit\u6280\u5de7\u6765\u4e34\u65f6\u6539\u53d8\u4ee3\u7801\u3002 \u4e00\u3001\u4f7f\u7528stash\u547d\u4ee4 stash\u547d\u4ee4\u53ef\u4ee5\u628a\u5f53\u524d\u4fee\u6539\u7684\u4ee3\u7801\u4fdd\u5b58\u5230\u4e00\u4e2a\u6682\u5b58\u533a\uff0c\u4ee5\u4fbf\u6211\u4eec\u6267\u884c\u5176\u4ed6\u64cd\u4f5c\u65f6\uff0c\u53ef\u4ee5\u968f\u65f6\u6062\u590d\u5230\u8fd9\u4e2a\u6682\u5b58\u533a\u3002\u6211\u4eec\u53ef\u4ee5\u901a\u8fc7\u4ee5\u4e0b\u547d\u4ee4\u5c06\u5f53\u524d\u7684\u4fee\u6539\u4fdd\u5b58\u5230stash\u4e2d\uff1a $ git stash \u767b\u5f55\u540e\u590d\u5236 \u5f53\u6211\u4eec\u9700\u8981\u6062\u590d\u5230\u8fd9\u4e2a\u4ee3\u7801\u4fee\u6539\u65f6\uff0c\u53ef\u4ee5\u4f7f\u7528\u4ee5\u4e0b\u547d\u4ee4\uff1a $ git stash apply \u767b\u5f55\u540e\u590d\u5236 \u8be5\u547d\u4ee4\u4f1a\u628a\u6700\u8fd1\u7684stash\u6062\u590d\u5230\u5f53\u524d\u4ee3\u7801\u4e2d\uff0c\u5982\u679c\u6709\u591a\u4e2astash\u7684\u8bdd\uff0c\u53ef\u4ee5\u4f7f\u7528stash@{x}\u6765\u6307\u5b9a\u3002 \u5982\u679c\u6211\u4eec\u9700\u8981\u540c\u65f6\u4fdd\u5b58\u5f53\u524d\u7684\u6682\u5b58\u533a\u548c\u5de5\u4f5c\u533a\u7684\u4fee\u6539\uff0c\u53ef\u4ee5\u4f7f\u7528\u4ee5\u4e0b\u547d\u4ee4\uff1a $ git stash save ‘message’ \u767b\u5f55\u540e\u590d\u5236 \u5176\u4e2d\uff0cmessage\u662f\u4fdd\u5b58\u7684stash\u7684\u6ce8\u91ca\u3002 \u4e8c\u3001\u4f7f\u7528reset\u547d\u4ee4 reset\u547d\u4ee4\u53ef\u4ee5\u6e05\u7a7a\u6682\u5b58\u533a\u6216\u5c06\u67d0\u4e2a\u6587\u4ef6\u6062\u590d\u5230\u67d0\u4e2a\u7248\u672c\u72b6\u6001\u3002\u6211\u4eec\u53ef\u4ee5\u4f7f\u7528\u4ee5\u4e0b\u547d\u4ee4\u5c06\u67d0\u4e2a\u6587\u4ef6\u6062\u590d\u5230\u4e0a\u4e00\u4e2a\u63d0\u4ea4\u7248\u672c\u7684\u72b6\u6001\uff1a $ git reset HEAD <file><\/file> \u767b\u5f55\u540e\u590d\u5236 \u5982\u679c\u9700\u8981\u6062\u590d\u6574\u4e2a\u5de5\u4f5c\u533a\u5230\u4e0a\u4e00\u4e2a\u63d0\u4ea4\u7248\u672c\u7684\u72b6\u6001\uff0c\u53ef\u4ee5\u4f7f\u7528\u4ee5\u4e0b\u547d\u4ee4\uff1a $ git reset –hard HEAD \u767b\u5f55\u540e\u590d\u5236 \u8fd9\u4f1a\u6e05\u7a7a\u6682\u5b58\u533a\u548c\u5de5\u4f5c\u533a\u6240\u6709\u7684\u4fee\u6539\u3002 \u5982\u679c\u9700\u8981\u6062\u590d\u5230\u67d0\u4e2a\u6307\u5b9a\u7684\u7248\u672c\uff0c\u53ef\u4ee5\u4f7f\u7528\u4ee5\u4e0b\u547d\u4ee4\uff1a $ git reset –hard <commit><\/commit> \u767b\u5f55\u540e\u590d\u5236 \u8fd9\u4f1a\u5c06\u5de5\u4f5c\u533a\u6062\u590d\u5230\u6307\u5b9a\u7684\u63d0\u4ea4\u7248\u672c\u72b6\u6001\u3002 \u9700\u8981\u6ce8\u610f\u7684\u662f\uff0creset\u547d\u4ee4\u4f1a\u5f3a\u5236\u6e05\u7a7a\u6682\u5b58\u533a\u548c\u5de5\u4f5c\u533a\u7684\u5185\u5bb9\uff0c\u6240\u4ee5\u8981\u7279\u522b\u5c0f\u5fc3\u4f7f\u7528\u3002 \u4e09\u3001\u4f7f\u7528checkout\u547d\u4ee4 checkout\u547d\u4ee4\u53ef\u4ee5\u5c06\u67d0\u4e2a\u6587\u4ef6\u7684\u4fee\u6539\u8fd8\u539f\u5230\u6307\u5b9a\u7684\u7248\u672c\u72b6\u6001\uff0c\u4f46\u662f\u4e0d\u4f1a\u5220\u9664\u6682\u5b58\u533a\u548c\u63d0\u4ea4\u5386\u53f2\u3002\u4ee5\u4e0b\u662f\u5982\u4f55\u4f7f\u7528checkout\u547d\u4ee4\u5c06\u67d0\u4e2a\u6587\u4ef6\u6062\u590d\u5230\u4e0a\u4e00\u4e2a\u63d0\u4ea4\u7248\u672c\u7684\u72b6\u6001\uff1a $ git checkout — <file><\/file> \u767b\u5f55\u540e\u590d\u5236 […]<\/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-20047","post","type-post","status-publish","format-standard","hentry","category-16"],"_links":{"self":[{"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/posts\/20047","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=20047"}],"version-history":[{"count":0,"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/posts\/20047\/revisions"}],"wp:attachment":[{"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/media?parent=20047"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/categories?post=20047"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/tags?post=20047"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}