{"id":19610,"date":"2024-11-19T11:08:08","date_gmt":"2024-11-19T03:08:08","guid":{"rendered":"https:\/\/fwq.ai\/blog\/19610\/"},"modified":"2024-11-19T11:08:08","modified_gmt":"2024-11-19T03:08:08","slug":"git%e7%aa%97%e5%8f%a3%e5%85%b3%e9%97%ad%e4%bb%a3%e7%a0%81%e5%a6%82%e4%bd%95%e6%89%be%e5%9b%9e","status":"publish","type":"post","link":"https:\/\/fwq.ai\/blog\/19610\/","title":{"rendered":"git\u7a97\u53e3\u5173\u95ed\u4ee3\u7801\u5982\u4f55\u627e\u56de"},"content":{"rendered":"

\u5bf9\u4e8e\u5f00\u53d1\u8005\u6765\u8bf4\uff0cgit\u662f\u5fc5\u4e0d\u53ef\u5c11\u7684\u5de5\u5177\u4e4b\u4e00\uff0c\u5b83\u80fd\u591f\u5e2e\u52a9\u6211\u4eec\u66f4\u597d\u5730\u7ba1\u7406\u4ee3\u7801\u3002\u4f46\u662f\uff0c\u5728\u4f7f\u7528git\u7684\u8fc7\u7a0b\u4e2d\uff0c\u6709\u4e9b\u7528\u6237\u4f1a\u9047\u5230\u4ee5\u4e0b\u60c5\u51b5\uff1a\u5728\u63d0\u4ea4\u4ee3\u7801\u4e4b\u524d\uff0c\u4e0d\u5c0f\u5fc3\u5c06git\u7a97\u53e3\u5173\u95ed\u4e86\uff0c\u5bfc\u81f4\u4ee3\u7801\u6d88\u5931\uff0c\u8be5\u600e\u4e48\u529e\u5462\uff1f<\/p>\n

\u5982\u679c\u4f60\u9047\u5230\u4e86\u7c7b\u4f3c\u7684\u95ee\u9898\uff0c\u4e0d\u8981\u614c\u5f20\uff0c\u63a5\u4e0b\u6765\u6211\u5c06\u4e3a\u4f60\u63d0\u4f9b\u51e0\u79cd\u89e3\u51b3\u65b9\u6848\u3002<\/p>\n

    \n
  1. \u5229\u7528git stash\u547d\u4ee4<\/li>\n<\/ol>\n

    \u9996\u5148\uff0c\u6211\u4eec\u53ef\u4ee5\u5229\u7528git stash\u547d\u4ee4\u6765\u627e\u56de\u4ee3\u7801\u3002\u8be5\u547d\u4ee4\u53ef\u4ee5\u5c06\u5f53\u524d\u5de5\u4f5c\u76ee\u5f55\u4e2d\u7684\u672a\u63d0\u4ea4\u7684\u66f4\u6539\u5b58\u50a8\u8d77\u6765\uff0c\u5e76\u91cd\u65b0\u56de\u5230Git\u7684\u6700\u8fd1\u4e00\u6b21\u63d0\u4ea4\u72b6\u6001\u3002<\/p>\n

    \u4f7f\u7528\u5982\u4e0b\u547d\u4ee4\uff1a<\/p>\n

    $ git stash apply<\/pre>\n
      \u767b\u5f55\u540e\u590d\u5236   <\/p>\n
    \u8be5\u547d\u4ee4\u4f1a\u5c06stash\u4e2d\u7684\u4ee3\u7801\u6062\u590d\u5230\u5de5\u4f5c\u76ee\u5f55\u4e2d\u3002<\/p>\n
    \u5982\u679c\u4f60\u8fd8\u9700\u8981\u67e5\u770b\u4e4b\u524dstash\u4fdd\u5b58\u7684\u5185\u5bb9\uff0c\u53ef\u4ee5\u4f7f\u7528\u5982\u4e0b\u547d\u4ee4\uff1a<\/p>\n
    $ git stash list<\/pre>\n
      \u767b\u5f55\u540e\u590d\u5236   <\/p>\n
    \u8be5\u547d\u4ee4\u5c06\u5217\u51fa\u4e4b\u524d\u4fdd\u5b58\u7684stash\u5217\u8868\u3002<\/p>\n
      \n
    1. \u5229\u7528git reflog\u547d\u4ee4<\/li>\n<\/ol>\n
      git reflog\u547d\u4ee4\u80fd\u591f\u5217\u51fa\u672c\u5730\u4ed3\u5e93\u4e2d\u7684\u6240\u6709\u64cd\u4f5c\uff0c\u5305\u62ec\u4e86\u6240\u6709\u672c\u5730\u5206\u652f\u7684\u63d0\u4ea4\u3001\u5408\u5e76\u3001fetch\u3001pull\u3001reset\u7b49\u64cd\u4f5c\u3002<\/p>\n
      \u4f7f\u7528\u5982\u4e0b\u547d\u4ee4\uff1a<\/p>\n
      $ git reflog<\/pre>\n
        \u767b\u5f55\u540e\u590d\u5236   <\/p>\n
      \u8be5\u547d\u4ee4\u5c06\u5217\u51fa\u672c\u5730\u4ed3\u5e93\u4e2d\u7684\u6240\u6709\u64cd\u4f5c\uff0c\u5e76\u4e14\u6bcf\u4e2a\u64cd\u4f5c\u90fd\u9644\u5e26\u4e86\u4e00\u4e2acommitID\u3002<\/p>\n
      \u53ef\u4ee5\u67e5\u627e\u4e4b\u524d\u672a\u63d0\u4ea4\u7684\u7248\u672c\uff0c\u5e76\u4e14\u5728\u627e\u5230\u76f8\u5173\u7684commitID\u540e\u8fdb\u884c\u8fd8\u539f\u3002<\/p>\n
        \n
      1. \u5229\u7528Git GUI<\/li>\n<\/ol>\n
        \u5982\u679c\u4e0a\u8ff0\u547d\u4ee4\u90fd\u4e0d\u80fd\u627e\u56de\u4ee3\u7801\uff0c\u6211\u4eec\u53ef\u4ee5\u8bd5\u8bd5\u5229\u7528Git GUI\u3002<\/p>\n
        Git GUI\u662fGit\u81ea\u5e26\u7684\u56fe\u5f62\u754c\u9762\u5de5\u5177\uff0c\u5b83\u4e0d\u4ec5\u80fd\u591f\u5e2e\u52a9\u6211\u4eec\u66f4\u597d\u5730\u7ba1\u7406\u4ee3\u7801\uff0c\u8fd8\u53ef\u4ee5\u5e2e\u52a9\u6211\u4eec\u627e\u56de\u4ee3\u7801\u3002<\/p>\n
        \u9996\u5148\u6211\u4eec\u6253\u5f00Git GUI\uff0c\u5728\u5de6\u4e0b\u89d2\u7684Commit History\u4e2d\uff0c\u9009\u62e9\u4f60\u5728\u5173\u95ed\u7a97\u53e3\u524d\u6b63\u5728\u5de5\u4f5c\u7684\u5206\u652f\u3002<\/p>\n
        \u7136\u540e\uff0c\u5728\u9009\u4e2d\u7684\u5206\u652f\u4e2d\u627e\u5230\u4f60\u5f53\u524d\u9700\u8981\u6062\u590d\u7684\u7248\u672c\uff0c\u53f3\u952e\u70b9\u51fb\u5b83\uff0c\u9009\u62e9”Create new branch”\u3002<\/p>\n
        \u6700\u540e\uff0c\u6211\u4eec\u53ef\u4ee5\u5c06\u65b0\u5206\u652f\u63a8\u9001\u5230\u8fdc\u7a0b\u4ed3\u5e93\u5e76\u5408\u5e76\u5230\u4e3b\u5206\u652f\u4e2d\u3002<\/p>\n
        \u4ee5\u4e0a\u5c31\u662f\u672c\u6587\u4ecb\u7ecd\u7684\u51e0\u79cd\u627e\u56deGit\u4ee3\u7801\u7684\u65b9\u6cd5\uff0c\u5e0c\u671b\u53ef\u4ee5\u5e2e\u52a9\u5230\u9047\u5230\u76f8\u540c\u95ee\u9898\u7684\u5f00\u53d1\u8005\u3002\u5982\u679c\u4f60\u8fd8\u6709\u5176\u4ed6\u65b9\u6cd5\uff0c\u6b22\u8fce\u5728\u8bc4\u8bba\u533a\u5206\u4eab\u3002<\/p>\n
        \u4ee5\u4e0a\u5c31\u662fgit\u7a97\u53e3\u5173\u95ed\u4ee3\u7801\u5982\u4f55\u627e\u56de\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":"
        \u5bf9\u4e8e\u5f00\u53d1\u8005\u6765\u8bf4\uff0cgit\u662f\u5fc5\u4e0d\u53ef\u5c11\u7684\u5de5\u5177\u4e4b\u4e00\uff0c\u5b83\u80fd\u591f\u5e2e\u52a9\u6211\u4eec\u66f4\u597d\u5730\u7ba1\u7406\u4ee3\u7801\u3002\u4f46\u662f\uff0c\u5728\u4f7f\u7528git\u7684\u8fc7\u7a0b\u4e2d\uff0c\u6709\u4e9b\u7528\u6237\u4f1a\u9047\u5230\u4ee5\u4e0b\u60c5\u51b5\uff1a\u5728\u63d0\u4ea4\u4ee3\u7801\u4e4b\u524d\uff0c\u4e0d\u5c0f\u5fc3\u5c06git\u7a97\u53e3\u5173\u95ed\u4e86\uff0c\u5bfc\u81f4\u4ee3\u7801\u6d88\u5931\uff0c\u8be5\u600e\u4e48\u529e\u5462\uff1f \u5982\u679c\u4f60\u9047\u5230\u4e86\u7c7b\u4f3c\u7684\u95ee\u9898\uff0c\u4e0d\u8981\u614c\u5f20\uff0c\u63a5\u4e0b\u6765\u6211\u5c06\u4e3a\u4f60\u63d0\u4f9b\u51e0\u79cd\u89e3\u51b3\u65b9\u6848\u3002 \u5229\u7528git stash\u547d\u4ee4 \u9996\u5148\uff0c\u6211\u4eec\u53ef\u4ee5\u5229\u7528git stash\u547d\u4ee4\u6765\u627e\u56de\u4ee3\u7801\u3002\u8be5\u547d\u4ee4\u53ef\u4ee5\u5c06\u5f53\u524d\u5de5\u4f5c\u76ee\u5f55\u4e2d\u7684\u672a\u63d0\u4ea4\u7684\u66f4\u6539\u5b58\u50a8\u8d77\u6765\uff0c\u5e76\u91cd\u65b0\u56de\u5230Git\u7684\u6700\u8fd1\u4e00\u6b21\u63d0\u4ea4\u72b6\u6001\u3002 \u4f7f\u7528\u5982\u4e0b\u547d\u4ee4\uff1a $ git stash apply \u767b\u5f55\u540e\u590d\u5236 \u8be5\u547d\u4ee4\u4f1a\u5c06stash\u4e2d\u7684\u4ee3\u7801\u6062\u590d\u5230\u5de5\u4f5c\u76ee\u5f55\u4e2d\u3002 \u5982\u679c\u4f60\u8fd8\u9700\u8981\u67e5\u770b\u4e4b\u524dstash\u4fdd\u5b58\u7684\u5185\u5bb9\uff0c\u53ef\u4ee5\u4f7f\u7528\u5982\u4e0b\u547d\u4ee4\uff1a $ git stash list \u767b\u5f55\u540e\u590d\u5236 \u8be5\u547d\u4ee4\u5c06\u5217\u51fa\u4e4b\u524d\u4fdd\u5b58\u7684stash\u5217\u8868\u3002 \u5229\u7528git reflog\u547d\u4ee4 git reflog\u547d\u4ee4\u80fd\u591f\u5217\u51fa\u672c\u5730\u4ed3\u5e93\u4e2d\u7684\u6240\u6709\u64cd\u4f5c\uff0c\u5305\u62ec\u4e86\u6240\u6709\u672c\u5730\u5206\u652f\u7684\u63d0\u4ea4\u3001\u5408\u5e76\u3001fetch\u3001pull\u3001reset\u7b49\u64cd\u4f5c\u3002 \u4f7f\u7528\u5982\u4e0b\u547d\u4ee4\uff1a $ git reflog \u767b\u5f55\u540e\u590d\u5236 \u8be5\u547d\u4ee4\u5c06\u5217\u51fa\u672c\u5730\u4ed3\u5e93\u4e2d\u7684\u6240\u6709\u64cd\u4f5c\uff0c\u5e76\u4e14\u6bcf\u4e2a\u64cd\u4f5c\u90fd\u9644\u5e26\u4e86\u4e00\u4e2acommitID\u3002 \u53ef\u4ee5\u67e5\u627e\u4e4b\u524d\u672a\u63d0\u4ea4\u7684\u7248\u672c\uff0c\u5e76\u4e14\u5728\u627e\u5230\u76f8\u5173\u7684commitID\u540e\u8fdb\u884c\u8fd8\u539f\u3002 \u5229\u7528Git GUI \u5982\u679c\u4e0a\u8ff0\u547d\u4ee4\u90fd\u4e0d\u80fd\u627e\u56de\u4ee3\u7801\uff0c\u6211\u4eec\u53ef\u4ee5\u8bd5\u8bd5\u5229\u7528Git GUI\u3002 Git GUI\u662fGit\u81ea\u5e26\u7684\u56fe\u5f62\u754c\u9762\u5de5\u5177\uff0c\u5b83\u4e0d\u4ec5\u80fd\u591f\u5e2e\u52a9\u6211\u4eec\u66f4\u597d\u5730\u7ba1\u7406\u4ee3\u7801\uff0c\u8fd8\u53ef\u4ee5\u5e2e\u52a9\u6211\u4eec\u627e\u56de\u4ee3\u7801\u3002 \u9996\u5148\u6211\u4eec\u6253\u5f00Git GUI\uff0c\u5728\u5de6\u4e0b\u89d2\u7684Commit History\u4e2d\uff0c\u9009\u62e9\u4f60\u5728\u5173\u95ed\u7a97\u53e3\u524d\u6b63\u5728\u5de5\u4f5c\u7684\u5206\u652f\u3002 \u7136\u540e\uff0c\u5728\u9009\u4e2d\u7684\u5206\u652f\u4e2d\u627e\u5230\u4f60\u5f53\u524d\u9700\u8981\u6062\u590d\u7684\u7248\u672c\uff0c\u53f3\u952e\u70b9\u51fb\u5b83\uff0c\u9009\u62e9”Create new branch”\u3002 \u6700\u540e\uff0c\u6211\u4eec\u53ef\u4ee5\u5c06\u65b0\u5206\u652f\u63a8\u9001\u5230\u8fdc\u7a0b\u4ed3\u5e93\u5e76\u5408\u5e76\u5230\u4e3b\u5206\u652f\u4e2d\u3002 \u4ee5\u4e0a\u5c31\u662f\u672c\u6587\u4ecb\u7ecd\u7684\u51e0\u79cd\u627e\u56deGit\u4ee3\u7801\u7684\u65b9\u6cd5\uff0c\u5e0c\u671b\u53ef\u4ee5\u5e2e\u52a9\u5230\u9047\u5230\u76f8\u540c\u95ee\u9898\u7684\u5f00\u53d1\u8005\u3002\u5982\u679c\u4f60\u8fd8\u6709\u5176\u4ed6\u65b9\u6cd5\uff0c\u6b22\u8fce\u5728\u8bc4\u8bba\u533a\u5206\u4eab\u3002 \u4ee5\u4e0a\u5c31\u662fgit\u7a97\u53e3\u5173\u95ed\u4ee3\u7801\u5982\u4f55\u627e\u56de\u7684\u8be6\u7ec6\u5185\u5bb9\uff0c\u66f4\u591a\u8bf7\u5173\u6ce8\u7c73\u4e91\u5176\u5b83\u76f8\u5173\u6587\u7ae0\uff01<\/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-19610","post","type-post","status-publish","format-standard","hentry","category-16"],"_links":{"self":[{"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/posts\/19610","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=19610"}],"version-history":[{"count":0,"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/posts\/19610\/revisions"}],"wp:attachment":[{"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/media?parent=19610"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/categories?post=19610"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/tags?post=19610"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}