{"id":57940,"date":"2023-10-21T18:40:45","date_gmt":"2023-10-21T10:40:45","guid":{"rendered":"https:\/\/docs.pingcode.com\/?p=57940"},"modified":"2023-10-21T18:40:46","modified_gmt":"2023-10-21T10:40:46","slug":"git%e4%b8%8a%e4%bc%a0%e5%90%8e%e6%96%b0%e4%bb%a3%e7%a0%81%e6%b6%88%e5%a4%b1%e6%80%8e%e4%b9%88%e6%89%be%e5%9b%9e","status":"publish","type":"post","link":"https:\/\/docs.pingcode.com\/ask\/57940.html","title":{"rendered":"git\u4e0a\u4f20\u540e\u65b0\u4ee3\u7801\u6d88\u5931\u600e\u4e48\u627e\u56de"},"content":{"rendered":"\n
\n

\u200b\u5f53\u4f60\u5728\u4f7f\u7528git\u65f6\u9047\u5230\u4e0a\u4f20\u540e\u65b0\u4ee3\u7801\u6d88\u5931\u7684\u95ee\u9898\uff0c\u4e0d\u8981\u60ca\u614c\u3002\u9075\u5faa\u4ee5\u4e0b\u6b65\u9aa4\uff0c\u4f60\u53ef\u4ee5\u6210\u529f\u627e\u56de\u4f60\u7684\u4ee3\u7801\uff1a1.\u9996\u5148\u68c0\u67e5\u63d0\u4ea4\u5386\u53f2\uff1b2.\u5229\u7528reflog\u67e5\u627e\u4e22\u5931\u7684\u63d0\u4ea4\uff1b3.\u4f7f\u7528cherry-pick\u6062\u590d\u4ee3\u7801\uff1b4.\u907f\u514d\u672a\u5408\u5e76\u7684\u4ee3\u7801\u76f4\u63a5\u8fdb\u884cforce push\uff1b5.\u5907\u4efd\u662f\u9884\u9632\u4ee3\u7801\u4e22\u5931\u7684\u6700\u4f73\u7b56\u7565\u3002\u5728\u4efb\u4f55git\u64cd\u4f5c\u524d\uff0c\u786e\u4fdd\u7406\u89e3\u5176\u529f\u80fd\u53ca\u540e\u679c\u3002<\/p>\n<\/blockquote>\n\n\n\n

1.\u9996\u5148\u68c0\u67e5\u63d0\u4ea4\u5386\u53f2<\/h2>\n\n\n\n

\u5728\u4f60\u8ba4\u4e3a\u4ee3\u7801\u4e22\u5931\u4e4b\u524d\uff0c\u5148\u786e\u8ba4\u4f60\u662f\u5426\u5df2\u7ecf\u5c06\u5176\u63d0\u4ea4\u5230\u4e86\u7248\u672c\u63a7\u5236\u4e2d\u3002\u6267\u884cgit log<\/strong>\u53ef\u4ee5\u67e5\u770b\u63d0\u4ea4\u5386\u53f2\uff0c\u5982\u679c\u4f60\u7684\u63d0\u4ea4\u5b58\u5728\u4e8e\u5176\u4e2d\uff0c\u90a3\u4e48\u4ee3\u7801\u5e76\u672a\u771f\u6b63\u4e22\u5931\u3002<\/p>\n\n\n\n

2.\u5229\u7528reflog\u67e5\u627e\u4e22\u5931\u7684\u63d0\u4ea4<\/h2>\n\n\n\n

Git\u5177\u6709\u4e00\u4e2a\u5f3a\u5927\u7684\u5de5\u5177\u53eb\u505areflog\uff0c\u5b83\u8bb0\u5f55\u4e86\u6bcf\u4e00\u4e2aHEAD\u7684\u79fb\u52a8\uff0c\u5373\u6bcf\u6b21\u63d0\u4ea4\u7684\u8bb0\u5f55\u3002\u8f93\u5165git reflog<\/strong>\uff0c\u4f60\u4f1a\u770b\u5230\u4e00\u4e2a\u8be6\u7ec6\u7684\u64cd\u4f5c\u5217\u8868\u3002\u627e\u5230\u4f60\u4e22\u5931\u7684\u63d0\u4ea4\u5bf9\u5e94\u7684\u54c8\u5e0c\u503c\u3002<\/p>\n\n\n\n

3.\u4f7f\u7528cherry-pick\u6062\u590d\u4ee3\u7801<\/h2>\n\n\n\n

\u627e\u5230\u4e86\u4e22\u5931\u7684\u63d0\u4ea4\u7684\u54c8\u5e0c\u503c\u540e\uff0c\u4f7f\u7528git cherry-pick [\u54c8\u5e0c\u503c]<\/strong>\u5373\u53ef\u6062\u590d\u8be5\u63d0\u4ea4\u3002cherry-pick\u547d\u4ee4\u5141\u8bb8\u4f60\u9009\u62e9\u4e00\u4e2a\u63d0\u4ea4\u5e76\u5c06\u5176\u5e94\u7528\u5230\u5f53\u524d\u5206\u652f\u4e0a\u3002<\/p>\n\n\n\n

4.\u907f\u514d\u672a\u5408\u5e76\u7684\u4ee3\u7801\u76f4\u63a5\u8fdb\u884cforce push<\/h2>\n\n\n\n

\u5728\u534f\u540c\u5de5\u4f5c\u65f6\uff0c\u591a\u4eba\u540c\u65f6\u5bf9\u4ee3\u7801\u8fdb\u884c\u66f4\u6539\u53ef\u80fd\u4f1a\u5bfc\u81f4\u5408\u5e76\u51b2\u7a81\u3002\u786e\u4fdd\u89e3\u51b3\u4e86\u6240\u6709\u51b2\u7a81\u540e\u518d\u4e0a\u4f20\u4ee3\u7801\uff0c\u4e14\u5c3d\u91cf\u907f\u514d\u76f4\u63a5\u4f7f\u7528force push\uff0c\u8fd9\u53ef\u80fd\u4f1a\u8986\u76d6\u5176\u4ed6\u4eba\u7684\u63d0\u4ea4\u3002<\/p>\n\n\n\n

5.\u5907\u4efd\u662f\u9884\u9632\u4ee3\u7801\u4e22\u5931\u7684\u6700\u4f73\u7b56\u7565<\/h2>\n\n\n\n

\u5373\u4f7fgit\u662f\u4e00\u4e2a\u5f3a\u5927\u7684\u7248\u672c\u63a7\u5236\u5de5\u5177\uff0c\u5b9a\u671f\u5907\u4efd\u4f60\u7684\u4ee3\u7801\u4ecd\u7136\u662f\u4e00\u4e2a\u660e\u667a\u7684\u9009\u62e9\u3002\u8fd9\u4e0d\u4ec5\u4e3a\u4f60\u63d0\u4f9b\u4e86\u4e00\u4e2a\u5b89\u5168\u7f51\uff0c\u8fd8\u53ef\u4ee5\u9632\u6b62\u56e0\u4e3a\u4e00\u4e9b\u4e0d\u53ef\u9884\u77e5\u7684\u95ee\u9898\u800c\u5bfc\u81f4\u7684\u4ee3\u7801\u4e22\u5931\u3002<\/p>\n\n\n\n

\u5728\u4f7f\u7528git\u65f6\uff0c\u6bcf\u4e00\u4e2a\u547d\u4ee4\u90fd\u53ef\u80fd\u4f1a\u5bf9\u4f60\u7684\u4ee3\u7801\u4ea7\u751f\u5f71\u54cd\u3002\u56e0\u6b64\uff0c\u5728\u6267\u884c\u4efb\u4f55\u64cd\u4f5c\u4e4b\u524d\uff0c\u786e\u4fdd\u4f60\u5b8c\u5168\u7406\u89e3\u5176\u529f\u80fd\u53ca\u53ef\u80fd\u7684\u540e\u679c\u3002\u5982\u679c\u4f60\u4e0d\u786e\u5b9a\uff0c\u6700\u597d\u5148\u67e5\u627e\u76f8\u5173\u7684\u6587\u6863\u6216\u8be2\u95ee\u6709\u7ecf\u9a8c\u7684\u540c\u4e8b\u3002<\/p>\n\n\n\n

\u603b\u4e4b\uff0c\u4ee3\u7801\u4e22\u5931\u662f\u6bcf\u4e2a\u5f00\u53d1\u8005\u90fd\u53ef\u80fd\u9762\u4e34\u7684\u95ee\u9898\uff0c\u4f46\u901a\u8fc7\u4e0a\u8ff0\u65b9\u6cd5\uff0c\u4f60\u53ef\u4ee5\u8f7b\u677e\u627e\u56de\u4e22\u5931\u7684\u4ee3\u7801\u3002\u4e3a\u4e86\u786e\u4fdd\u4ee3\u7801\u7684\u5b89\u5168\uff0c\u6700\u597d\u517b\u6210\u826f\u597d\u7684\u7248\u672c\u63a7\u5236\u4e60\u60ef\uff0c\u5b9a\u671f\u5907\u4efd\uff0c\u907f\u514d\u4e0d\u5fc5\u8981\u7684\u98ce\u9669\u3002<\/p>\n\n\n\n

\"\"<\/figure>\n\n\n\n

\u5e38\u89c1\u95ee\u7b54\uff1a<\/strong><\/p>\n\n\n\n

    \n
  • Q1: \u4e3a\u4ec0\u4e48\u5728\u6211push\u5230git\u540e\uff0c\u6211\u7684\u65b0\u4ee3\u7801\u4f1a\u6d88\u5931\uff1f<\/strong><\/li>\n\n\n\n
  • A1:<\/strong> \u4ee3\u7801\u6d88\u5931\u53ef\u80fd\u662f\u56e0\u4e3a\u591a\u79cd\u539f\u56e0\u3002\u53ef\u80fd\u662f\u56e0\u4e3a\u5728\u63a8\u9001\u4e4b\u524d\uff0c\u4f60\u4e0d\u5c0f\u5fc3\u8fdb\u884c\u4e86\u9519\u8bef\u7684\u5408\u5e76\u6216\u91cd\u7f6e\u64cd\u4f5c\uff1b\u6216\u8005\u4f60\u53ef\u80fd\u5df2\u7ecf\u5728\u53e6\u4e00\u4e2a\u5206\u652f\u4e0a\u8fdb\u884c\u4e86\u5de5\u4f5c\uff0c\u4f46\u5c1d\u8bd5\u5728\u4e3b\u5206\u652f\u4e0a\u8fdb\u884cpush\uff1b\u53c8\u6216\u8005\u662f\u4e0e\u8fdc\u7a0b\u4ed3\u5e93\u7684\u4ee3\u7801\u4ea7\u751f\u4e86\u51b2\u7a81\u3002\u4e3a\u4e86\u9632\u6b62\u8fd9\u79cd\u60c5\u51b5\uff0c\u5efa\u8bae\u5728push\u4e4b\u524d\u603b\u662f\u5148\u8fdb\u884cpull\uff0c\u786e\u4fdd\u672c\u5730\u548c\u8fdc\u7a0b\u4ed3\u5e93\u7684\u4ee3\u7801\u662f\u540c\u6b65\u7684\u3002<\/li>\n<\/ul>\n\n\n\n
      \n
    • Q2: \u6211\u5982\u4f55\u4f7f\u7528git\u6765\u627e\u56de\u6211\u5931\u53bb\u7684\u4ee3\u7801\uff1f<\/strong><\/li>\n\n\n\n
    • A2:<\/strong> \u4f7f\u7528git log<\/strong>\u547d\u4ee4\u6765\u67e5\u770b\u63d0\u4ea4\u5386\u53f2\uff0c\u627e\u5230\u4f60\u4e22\u5931\u4ee3\u7801\u4e4b\u524d\u7684\u63d0\u4ea4ID\u3002\u7136\u540e\uff0c\u4f7f\u7528git checkout [\u63d0\u4ea4ID]<\/strong>\u6765\u6062\u590d\u5230\u8be5\u63d0\u4ea4\u3002\u4e00\u65e6\u4f60\u627e\u5230\u4e86\u6b63\u786e\u7684\u7248\u672c\uff0c\u4f60\u53ef\u4ee5\u521b\u5efa\u4e00\u4e2a\u65b0\u7684\u5206\u652f\uff0c\u6216\u8005\u4f7f\u7528git reset<\/strong>\u5c06\u4e3b\u5206\u652f\u6307\u5411\u6b63\u786e\u7684\u63d0\u4ea4\u3002<\/li>\n<\/ul>\n\n\n\n
        \n
      • Q3: \u5982\u679c\u6211\u4e0d\u786e\u5b9a\u5728\u54ea\u6b21\u63d0\u4ea4\u4e2d\u4e22\u5931\u4e86\u4ee3\u7801\uff0c\u6211\u8be5\u5982\u4f55\u64cd\u4f5c\uff1f<\/strong><\/li>\n\n\n\n
      • A3:<\/strong> \u4f60\u53ef\u4ee5\u4f7f\u7528git log -p<\/strong>\u6216\u8005git diff [\u63d0\u4ea4ID1]..[\u63d0\u4ea4ID2]<\/strong>\u6765\u67e5\u770b\u4e24\u6b21\u63d0\u4ea4\u4e4b\u95f4\u7684\u5dee\u5f02\u3002\u8fd9\u6837\uff0c\u4f60\u53ef\u4ee5\u9010\u6b65\u5730\u67e5\u770b\u6bcf\u6b21\u63d0\u4ea4\u7684\u53d8\u5316\uff0c\u627e\u51fa\u54ea\u6b21\u63d0\u4ea4\u5bfc\u81f4\u4e86\u4ee3\u7801\u7684\u4e22\u5931\u3002<\/li>\n<\/ul>\n","protected":false},"excerpt":{"rendered":"\u200b\u5f53\u4f60\u5728\u4f7f\u7528git\u65f6\u9047\u5230\u4e0a\u4f20\u540e\u65b0\u4ee3\u7801\u6d88\u5931\u7684\u95ee\u9898\uff0c\u4e0d\u8981\u60ca\u614c\u3002\u9075\u5faa\u4ee5\u4e0b\u6b65\u9aa4\uff0c\u4f60\u53ef\u4ee5\u6210\u529f\u627e\u56de\u4f60\u7684\u4ee3\u7801\uff1a1.\u9996\u5148\u68c0\u67e5\u63d0 […]","protected":false},"author":7,"featured_media":57942,"comment_status":"closed","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"_acf_changed":false,"footnotes":""},"categories":[37],"tags":[1163],"acf":[],"_links":{"self":[{"href":"https:\/\/docs.pingcode.com\/wp-json\/wp\/v2\/posts\/57940"}],"collection":[{"href":"https:\/\/docs.pingcode.com\/wp-json\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/docs.pingcode.com\/wp-json\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/docs.pingcode.com\/wp-json\/wp\/v2\/users\/7"}],"replies":[{"embeddable":true,"href":"https:\/\/docs.pingcode.com\/wp-json\/wp\/v2\/comments?post=57940"}],"version-history":[{"count":0,"href":"https:\/\/docs.pingcode.com\/wp-json\/wp\/v2\/posts\/57940\/revisions"}],"wp:featuredmedia":[{"embeddable":true,"href":"https:\/\/docs.pingcode.com\/wp-json\/wp\/v2\/media\/57942"}],"wp:attachment":[{"href":"https:\/\/docs.pingcode.com\/wp-json\/wp\/v2\/media?parent=57940"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/docs.pingcode.com\/wp-json\/wp\/v2\/categories?post=57940"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/docs.pingcode.com\/wp-json\/wp\/v2\/tags?post=57940"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}