{"id":19181,"date":"2024-11-19T08:08:52","date_gmt":"2024-11-19T00:08:52","guid":{"rendered":"https:\/\/fwq.ai\/blog\/19181\/"},"modified":"2024-11-19T08:08:52","modified_gmt":"2024-11-19T00:08:52","slug":"git%e4%bf%ae%e6%94%b9%e5%8e%86%e5%8f%b2%e7%9a%84%e6%96%b9%e6%b3%95%e5%92%8c%e6%b3%a8%e6%84%8f%e4%ba%8b%e9%a1%b9","status":"publish","type":"post","link":"https:\/\/fwq.ai\/blog\/19181\/","title":{"rendered":"Git\u4fee\u6539\u5386\u53f2\u7684\u65b9\u6cd5\u548c\u6ce8\u610f\u4e8b\u9879"},"content":{"rendered":"

git\u662f\u4e00\u6b3e\u975e\u5e38\u6d41\u884c\u7684\u5206\u5e03\u5f0f\u7248\u672c\u63a7\u5236\u5de5\u5177\uff0c\u5b83\u53ef\u4ee5\u5e2e\u52a9\u6211\u4eec\u7ba1\u7406\u4ee3\u7801\u7684\u4fee\u6539\u5386\u53f2\uff0c\u5e76\u5e2e\u52a9\u6211\u4eec\u534f\u4f5c\u5f00\u53d1\u548c\u7ef4\u62a4\u4ee3\u7801\u3002<\/p>\n

\u5728\u4f7f\u7528Git\u8fdb\u884c\u5f00\u53d1\u7684\u8fc7\u7a0b\u4e2d\uff0c\u6211\u4eec\u65f6\u5e38\u9700\u8981\u4fee\u6539\u4ee3\u7801\u7684\u5386\u53f2\u8bb0\u5f55\uff0c\u6bd4\u5982\u4fee\u6539\u63d0\u4ea4\u4fe1\u606f\u3001\u5408\u5e76\u5206\u652f\u7b49\u3002\u672c\u6587\u5c06\u4ecb\u7ecdGit\u4fee\u6539\u5386\u53f2\u7684\u65b9\u6cd5\u548c\u6ce8\u610f\u4e8b\u9879\u3002<\/p>\n

\u4e00\u3001\u4fee\u6539\u6700\u8fd1\u4e00\u6b21\u63d0\u4ea4\u7684\u4fe1\u606f<\/p>\n

\u5728\u4f7f\u7528Git\u8fdb\u884c\u5f00\u53d1\u65f6\uff0c\u6bcf\u6b21\u63d0\u4ea4\u4ee3\u7801\u65f6\u90fd\u9700\u8981\u5199\u63d0\u4ea4\u4fe1\u606f\u3002\u4f46\u6709\u65f6\u5019\u53ef\u80fd\u4f1a\u56e0\u4e3a\u5404\u79cd\u539f\u56e0\u5199\u9519\u6216\u6f0f\u6389\u4e86\u67d0\u4e9b\u4fe1\u606f\uff0c\u8fd9\u65f6\u5c31\u9700\u8981\u4fee\u6539\u63d0\u4ea4\u4fe1\u606f\u3002<\/p>\n

\u6211\u4eec\u53ef\u4ee5\u4f7f\u7528Git\u7684\u547d\u4ee4git commit –amend\u6765\u4fee\u6539\u6700\u8fd1\u4e00\u6b21\u7684\u63d0\u4ea4\u4fe1\u606f\u3002\u5177\u4f53\u64cd\u4f5c\u5982\u4e0b\uff1a<\/p>\n

    \n
  1. \u5728\u7ec8\u7aef\u4e2d\u8fdb\u5165\u4ee3\u7801\u6240\u5728\u7684git\u4ed3\u5e93\u76ee\u5f55\uff0c\u6267\u884c\u4ee5\u4e0b\u547d\u4ee4:<\/li>\n<\/ol>\n
    git commit --amend<\/pre>\n
      \u767b\u5f55\u540e\u590d\u5236    \u767b\u5f55\u540e\u590d\u5236   <\/p>\n
      \n
    1. \u5728\u6587\u672c\u7f16\u8f91\u5668\u4e2d\u4fee\u6539\u63d0\u4ea4\u4fe1\u606f\u3002\u8bf7\u6ce8\u610f\uff0c\u6700\u597d\u4e0d\u8981\u4fee\u6539\u5df2\u7ecf\u63d0\u4ea4\u7684\u6587\u4ef6\u5185\u5bb9\u3002<\/li>\n
    2. \u4fdd\u5b58\u4fee\u6539\u540e\u7684\u63d0\u4ea4\u4fe1\u606f\u5e76\u9000\u51fa\u3002<\/li>\n<\/ol>\n
      \u6b64\u65f6\uff0c\u6211\u4eec\u7684\u6700\u8fd1\u4e00\u6b21\u63d0\u4ea4\u7684\u4fe1\u606f\u5df2\u7ecf\u88ab\u4fee\u6539\u4e86\u3002<\/p>\n
      \u4e8c\u3001\u4fee\u6539\u5386\u53f2\u8bb0\u5f55\u4e2d\u67d0\u4e2a\u63d0\u4ea4\u7684\u4fe1\u606f<\/p>\n
      \u6709\u65f6\u5019\u53ef\u80fd\u9700\u8981\u4fee\u6539\u5386\u53f2\u8bb0\u5f55\u4e2d\u67d0\u4e2a\u63d0\u4ea4\u7684\u4fe1\u606f\uff0c\u6bd4\u5982\u4e3a\u4e86\u66f4\u597d\u5730\u8bb0\u5f55\u66f4\u65b0\u5386\u53f2\uff0c\u6216\u662f\u4e3a\u4e86\u907f\u514d\u8bef\u89e3\u7b49\u539f\u56e0\u3002\u5177\u4f53\u64cd\u4f5c\u5982\u4e0b\uff1a<\/p>\n
        \n
      1. \u5728\u7ec8\u7aef\u4e2d\u8fdb\u5165\u4ee3\u7801\u6240\u5728\u7684git\u4ed3\u5e93\u76ee\u5f55\uff0c\u6267\u884c\u4ee5\u4e0b\u547d\u4ee4:<\/li>\n<\/ol>\n
        git rebase -i HEAD~n<\/pre>\n
          \u767b\u5f55\u540e\u590d\u5236    \u767b\u5f55\u540e\u590d\u5236   <\/p>\n
        \u5176\u4e2dn\u8868\u793a\u4f60\u9700\u8981\u4fee\u6539\u7684\u63d0\u4ea4\u4e4b\u524d\u7684\u63d0\u4ea4\u6b21\u6570\uff0c\u6bd4\u5982n=5\u8868\u793a\u4f60\u9700\u8981\u4fee\u6539\u5012\u6570\u7b2c6\u4e2a\u63d0\u4ea4\u7684\u4fe1\u606f\u3002<\/p>\n
          \n
        1. git\u4f1a\u6253\u5f00\u4e00\u4e2a\u6587\u672c\u7f16\u8f91\u5668\u7a97\u53e3\uff0c\u663e\u793a\u5f85\u4fee\u6539\u7684\u63d0\u4ea4\u8bb0\u5f55\u3002\u6bcf\u4e2a\u63d0\u4ea4\u7684\u524d\u9762\u6709\u4e00\u4e2a\u5355\u8bcd\uff0c\u5b83\u4eec\u5206\u522b\u8868\u793a\u4e0d\u540c\u7684\u64cd\u4f5c\u3002\u5982\u679c\u9700\u8981\u4fee\u6539\u4e00\u4e2a\u63d0\u4ea4\u7684\u4fe1\u606f\uff0c\u8bf7\u5c06\u8fd9\u4e2a\u63d0\u4ea4\u524d\u9762\u7684\u5355\u8bcd\u7531pick\u6539\u4e3aedit\u3002<\/li>\n
        2. \u4fdd\u5b58\u5e76\u9000\u51fa\u6587\u672c\u7f16\u8f91\u5668\u3002<\/li>\n
        3. \u4fee\u6539\u63d0\u4ea4\u4fe1\u606f\u3002\u6267\u884c\u4ee5\u4e0b\u547d\u4ee4:<\/li>\n<\/ol>\n
          git commit --amend<\/pre>\n
            \u767b\u5f55\u540e\u590d\u5236    \u767b\u5f55\u540e\u590d\u5236   <\/p>\n
            \n
          1. \u4fdd\u5b58\u4fee\u6539\u540e\u7684\u63d0\u4ea4\u4fe1\u606f\u5e76\u9000\u51fa\u3002<\/li>\n
          2. \u6267\u884cgit rebase –continue\uff0c\u8ba9\u4fee\u6539\u751f\u6548\u3002\u6b64\u65f6\uff0c\u6211\u4eec\u7684\u63d0\u4ea4\u4fe1\u606f\u5df2\u7ecf\u88ab\u4fee\u6539\u4e86\u3002<\/li>\n<\/ol>\n
            \u4e09\u3001\u5408\u5e76\u63d0\u4ea4\u5386\u53f2<\/p>\n
            \u5408\u5e76\u63d0\u4ea4\u5386\u53f2\u662f\u4e3a\u4e86\u8ba9\u6211\u4eec\u7684\u5386\u53f2\u8bb0\u5f55\u66f4\u52a0\u6e05\u6670\uff0c\u907f\u514d\u51fa\u73b0\u8fc7\u591a\u7684\u65e0\u7528\u63d0\u4ea4\u8bb0\u5f55\u3002\u5177\u4f53\u64cd\u4f5c\u5982\u4e0b:<\/p>\n
              \n
            1. \u5728\u7ec8\u7aef\u4e2d\u8fdb\u5165\u4ee3\u7801\u6240\u5728\u7684git\u4ed3\u5e93\u76ee\u5f55\uff0c\u6267\u884c\u4ee5\u4e0b\u547d\u4ee4:<\/li>\n<\/ol>\n
              git rebase -i HEAD~n<\/pre>\n
                \u767b\u5f55\u540e\u590d\u5236    \u767b\u5f55\u540e\u590d\u5236   <\/p>\n
              \u5176\u4e2dn\u8868\u793a\u4f60\u9700\u8981\u5408\u5e76\u63d0\u4ea4\u5386\u53f2\u7684\u63d0\u4ea4\u4e4b\u524d\u7684\u63d0\u4ea4\u6b21\u6570\u3002<\/p>\n
                \n
              1. git\u4f1a\u6253\u5f00\u4e00\u4e2a\u6587\u672c\u7f16\u8f91\u5668\u7a97\u53e3\uff0c\u663e\u793a\u5f85\u4fee\u6539\u7684\u63d0\u4ea4\u8bb0\u5f55\u3002\u6bcf\u4e2a\u63d0\u4ea4\u7684\u524d\u9762\u6709\u4e00\u4e2a\u5355\u8bcd\uff0c\u5b83\u4eec\u5206\u522b\u8868\u793a\u4e0d\u540c\u7684\u64cd\u4f5c\u3002\u5982\u679c\u9700\u8981\u5408\u5e76\u591a\u4e2a\u63d0\u4ea4\uff0c\u53ef\u4ee5\u9009\u62e9\u6700\u65e9\u7684\u4e00\u4e2a\u63d0\u4ea4\uff0c\u5c06\u5176\u524d\u9762\u7684pick\u6539\u4e3asquash\uff0c\u7136\u540e\u4fdd\u5b58\u5e76\u9000\u51fa\u3002<\/li>\n
              2. \u5728\u4e0b\u4e00\u4e2a\u6587\u672c\u7f16\u8f91\u5668\u7a97\u53e3\u4e2d\u7f16\u8f91\u5408\u5e76\u540e\u7684\u63d0\u4ea4\u6ce8\u91ca\uff0c\u5e76\u4fdd\u5b58\u9000\u51fa\u3002<\/li>\n
              3. \u6267\u884cgit rebase –continue\u547d\u4ee4\uff0c\u6765\u5b8c\u6210\u63d0\u4ea4\u5386\u53f2\u7684\u5408\u5e76\u3002<\/li>\n<\/ol>\n
                \u6ce8\u610f\u4e8b\u9879\uff1a<\/p>\n
                  \n
                1. \u5728\u4fee\u6539Git\u7684\u5386\u53f2\u8bb0\u5f55\u65f6\uff0c\u8bf7\u786e\u4fdd\u5bf9\u81ea\u5df1\u7684\u4fee\u6539\u8db3\u591f\u81ea\u4fe1\uff0c\u56e0\u4e3a\u4fee\u6539\u5386\u53f2\u8bb0\u5f55\u6709\u53ef\u80fd\u4f1a\u5bf9\u5176\u4ed6\u4eba\u7684\u4ee3\u7801\u6709\u5f71\u54cd\u3002<\/li>\n
                2. \u8bf7\u52ff\u5728\u5df2\u7ecf\u63a8\u9001\u5230\u8fdc\u7a0b\u4ed3\u5e93\u7684\u5206\u652f\u4e0a\u8fdb\u884c\u4fee\u6539\u5386\u53f2\u8bb0\u5f55\u7684\u64cd\u4f5c\uff0c\u56e0\u4e3a\u8fd9\u4f1a\u5f3a\u5236\u5176\u4ed6\u4eba\u7684\u4ee3\u7801\u4e0e\u4f60\u7684\u4e0d\u4e00\u81f4\u3002<\/li>\n
                3. \u5728\u64cd\u4f5c\u4fee\u6539\u5386\u53f2\u8bb0\u5f55\u7684\u547d\u4ee4\u524d\uff0c\u8bf7\u52a1\u5fc5\u5907\u4efd\u597d\u91cd\u8981\u7684\u4ee3\u7801\uff0c\u4ee5\u514d\u8bef\u64cd\u4f5c\u5bfc\u81f4\u4ee3\u7801\u4e22\u5931\u3002<\/li>\n<\/ol>\n
                  \u603b\u7ed3<\/p>\n
                  \u901a\u8fc7\u672c\u6587\uff0c\u6211\u4eec\u4e86\u89e3\u4e86\u5982\u4f55\u4fee\u6539Git\u7684\u5386\u53f2\u8bb0\u5f55\u3002\u4e0d\u7ba1\u662f\u4fee\u6539\u6700\u8fd1\u4e00\u6b21\u63d0\u4ea4\u7684\u4fe1\u606f\uff0c\u8fd8\u662f\u4fee\u6539\u5386\u53f2\u8bb0\u5f55\u4e2d\u67d0\u4e2a\u63d0\u4ea4\u7684\u4fe1\u606f\uff0c\u6216\u8005\u662f\u5408\u5e76\u63d0\u4ea4\u5386\u53f2\uff0c\u6211\u4eec\u90fd\u9700\u8981\u5c3d\u53ef\u80fd\u5730\u4fdd\u8bc1\u64cd\u4f5c\u7684\u6b63\u786e\u6027\u548c\u8c28\u614e\u6027\uff0c\u4ee5\u907f\u514d\u51fa\u73b0\u4e0d\u5fc5\u8981\u7684\u9ebb\u70e6\u3002<\/p>\n
                  \u4ee5\u4e0a\u5c31\u662fGit\u4fee\u6539\u5386\u53f2\u7684\u65b9\u6cd5\u548c\u6ce8\u610f\u4e8b\u9879\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":"
                  git\u662f\u4e00\u6b3e\u975e\u5e38\u6d41\u884c\u7684\u5206\u5e03\u5f0f\u7248\u672c\u63a7\u5236\u5de5\u5177\uff0c\u5b83\u53ef\u4ee5\u5e2e\u52a9\u6211\u4eec\u7ba1\u7406\u4ee3\u7801\u7684\u4fee\u6539\u5386\u53f2\uff0c\u5e76\u5e2e\u52a9\u6211\u4eec\u534f\u4f5c\u5f00\u53d1\u548c\u7ef4\u62a4\u4ee3\u7801\u3002 \u5728\u4f7f\u7528Git\u8fdb\u884c\u5f00\u53d1\u7684\u8fc7\u7a0b\u4e2d\uff0c\u6211\u4eec\u65f6\u5e38\u9700\u8981\u4fee\u6539\u4ee3\u7801\u7684\u5386\u53f2\u8bb0\u5f55\uff0c\u6bd4\u5982\u4fee\u6539\u63d0\u4ea4\u4fe1\u606f\u3001\u5408\u5e76\u5206\u652f\u7b49\u3002\u672c\u6587\u5c06\u4ecb\u7ecdGit\u4fee\u6539\u5386\u53f2\u7684\u65b9\u6cd5\u548c\u6ce8\u610f\u4e8b\u9879\u3002 \u4e00\u3001\u4fee\u6539\u6700\u8fd1\u4e00\u6b21\u63d0\u4ea4\u7684\u4fe1\u606f \u5728\u4f7f\u7528Git\u8fdb\u884c\u5f00\u53d1\u65f6\uff0c\u6bcf\u6b21\u63d0\u4ea4\u4ee3\u7801\u65f6\u90fd\u9700\u8981\u5199\u63d0\u4ea4\u4fe1\u606f\u3002\u4f46\u6709\u65f6\u5019\u53ef\u80fd\u4f1a\u56e0\u4e3a\u5404\u79cd\u539f\u56e0\u5199\u9519\u6216\u6f0f\u6389\u4e86\u67d0\u4e9b\u4fe1\u606f\uff0c\u8fd9\u65f6\u5c31\u9700\u8981\u4fee\u6539\u63d0\u4ea4\u4fe1\u606f\u3002 \u6211\u4eec\u53ef\u4ee5\u4f7f\u7528Git\u7684\u547d\u4ee4git commit –amend\u6765\u4fee\u6539\u6700\u8fd1\u4e00\u6b21\u7684\u63d0\u4ea4\u4fe1\u606f\u3002\u5177\u4f53\u64cd\u4f5c\u5982\u4e0b\uff1a \u5728\u7ec8\u7aef\u4e2d\u8fdb\u5165\u4ee3\u7801\u6240\u5728\u7684git\u4ed3\u5e93\u76ee\u5f55\uff0c\u6267\u884c\u4ee5\u4e0b\u547d\u4ee4: git commit –amend \u767b\u5f55\u540e\u590d\u5236 \u767b\u5f55\u540e\u590d\u5236 \u5728\u6587\u672c\u7f16\u8f91\u5668\u4e2d\u4fee\u6539\u63d0\u4ea4\u4fe1\u606f\u3002\u8bf7\u6ce8\u610f\uff0c\u6700\u597d\u4e0d\u8981\u4fee\u6539\u5df2\u7ecf\u63d0\u4ea4\u7684\u6587\u4ef6\u5185\u5bb9\u3002 \u4fdd\u5b58\u4fee\u6539\u540e\u7684\u63d0\u4ea4\u4fe1\u606f\u5e76\u9000\u51fa\u3002 \u6b64\u65f6\uff0c\u6211\u4eec\u7684\u6700\u8fd1\u4e00\u6b21\u63d0\u4ea4\u7684\u4fe1\u606f\u5df2\u7ecf\u88ab\u4fee\u6539\u4e86\u3002 \u4e8c\u3001\u4fee\u6539\u5386\u53f2\u8bb0\u5f55\u4e2d\u67d0\u4e2a\u63d0\u4ea4\u7684\u4fe1\u606f \u6709\u65f6\u5019\u53ef\u80fd\u9700\u8981\u4fee\u6539\u5386\u53f2\u8bb0\u5f55\u4e2d\u67d0\u4e2a\u63d0\u4ea4\u7684\u4fe1\u606f\uff0c\u6bd4\u5982\u4e3a\u4e86\u66f4\u597d\u5730\u8bb0\u5f55\u66f4\u65b0\u5386\u53f2\uff0c\u6216\u662f\u4e3a\u4e86\u907f\u514d\u8bef\u89e3\u7b49\u539f\u56e0\u3002\u5177\u4f53\u64cd\u4f5c\u5982\u4e0b\uff1a \u5728\u7ec8\u7aef\u4e2d\u8fdb\u5165\u4ee3\u7801\u6240\u5728\u7684git\u4ed3\u5e93\u76ee\u5f55\uff0c\u6267\u884c\u4ee5\u4e0b\u547d\u4ee4: git rebase -i HEAD~n \u767b\u5f55\u540e\u590d\u5236 \u767b\u5f55\u540e\u590d\u5236 \u5176\u4e2dn\u8868\u793a\u4f60\u9700\u8981\u4fee\u6539\u7684\u63d0\u4ea4\u4e4b\u524d\u7684\u63d0\u4ea4\u6b21\u6570\uff0c\u6bd4\u5982n=5\u8868\u793a\u4f60\u9700\u8981\u4fee\u6539\u5012\u6570\u7b2c6\u4e2a\u63d0\u4ea4\u7684\u4fe1\u606f\u3002 git\u4f1a\u6253\u5f00\u4e00\u4e2a\u6587\u672c\u7f16\u8f91\u5668\u7a97\u53e3\uff0c\u663e\u793a\u5f85\u4fee\u6539\u7684\u63d0\u4ea4\u8bb0\u5f55\u3002\u6bcf\u4e2a\u63d0\u4ea4\u7684\u524d\u9762\u6709\u4e00\u4e2a\u5355\u8bcd\uff0c\u5b83\u4eec\u5206\u522b\u8868\u793a\u4e0d\u540c\u7684\u64cd\u4f5c\u3002\u5982\u679c\u9700\u8981\u4fee\u6539\u4e00\u4e2a\u63d0\u4ea4\u7684\u4fe1\u606f\uff0c\u8bf7\u5c06\u8fd9\u4e2a\u63d0\u4ea4\u524d\u9762\u7684\u5355\u8bcd\u7531pick\u6539\u4e3aedit\u3002 \u4fdd\u5b58\u5e76\u9000\u51fa\u6587\u672c\u7f16\u8f91\u5668\u3002 \u4fee\u6539\u63d0\u4ea4\u4fe1\u606f\u3002\u6267\u884c\u4ee5\u4e0b\u547d\u4ee4: git commit –amend \u767b\u5f55\u540e\u590d\u5236 \u767b\u5f55\u540e\u590d\u5236 \u4fdd\u5b58\u4fee\u6539\u540e\u7684\u63d0\u4ea4\u4fe1\u606f\u5e76\u9000\u51fa\u3002 \u6267\u884cgit rebase –continue\uff0c\u8ba9\u4fee\u6539\u751f\u6548\u3002\u6b64\u65f6\uff0c\u6211\u4eec\u7684\u63d0\u4ea4\u4fe1\u606f\u5df2\u7ecf\u88ab\u4fee\u6539\u4e86\u3002 \u4e09\u3001\u5408\u5e76\u63d0\u4ea4\u5386\u53f2 \u5408\u5e76\u63d0\u4ea4\u5386\u53f2\u662f\u4e3a\u4e86\u8ba9\u6211\u4eec\u7684\u5386\u53f2\u8bb0\u5f55\u66f4\u52a0\u6e05\u6670\uff0c\u907f\u514d\u51fa\u73b0\u8fc7\u591a\u7684\u65e0\u7528\u63d0\u4ea4\u8bb0\u5f55\u3002\u5177\u4f53\u64cd\u4f5c\u5982\u4e0b: \u5728\u7ec8\u7aef\u4e2d\u8fdb\u5165\u4ee3\u7801\u6240\u5728\u7684git\u4ed3\u5e93\u76ee\u5f55\uff0c\u6267\u884c\u4ee5\u4e0b\u547d\u4ee4: git rebase -i HEAD~n \u767b\u5f55\u540e\u590d\u5236 \u767b\u5f55\u540e\u590d\u5236 \u5176\u4e2dn\u8868\u793a\u4f60\u9700\u8981\u5408\u5e76\u63d0\u4ea4\u5386\u53f2\u7684\u63d0\u4ea4\u4e4b\u524d\u7684\u63d0\u4ea4\u6b21\u6570\u3002 git\u4f1a\u6253\u5f00\u4e00\u4e2a\u6587\u672c\u7f16\u8f91\u5668\u7a97\u53e3\uff0c\u663e\u793a\u5f85\u4fee\u6539\u7684\u63d0\u4ea4\u8bb0\u5f55\u3002\u6bcf\u4e2a\u63d0\u4ea4\u7684\u524d\u9762\u6709\u4e00\u4e2a\u5355\u8bcd\uff0c\u5b83\u4eec\u5206\u522b\u8868\u793a\u4e0d\u540c\u7684\u64cd\u4f5c\u3002\u5982\u679c\u9700\u8981\u5408\u5e76\u591a\u4e2a\u63d0\u4ea4\uff0c\u53ef\u4ee5\u9009\u62e9\u6700\u65e9\u7684\u4e00\u4e2a\u63d0\u4ea4\uff0c\u5c06\u5176\u524d\u9762\u7684pick\u6539\u4e3asquash\uff0c\u7136\u540e\u4fdd\u5b58\u5e76\u9000\u51fa\u3002 \u5728\u4e0b\u4e00\u4e2a\u6587\u672c\u7f16\u8f91\u5668\u7a97\u53e3\u4e2d\u7f16\u8f91\u5408\u5e76\u540e\u7684\u63d0\u4ea4\u6ce8\u91ca\uff0c\u5e76\u4fdd\u5b58\u9000\u51fa\u3002 \u6267\u884cgit rebase –continue\u547d\u4ee4\uff0c\u6765\u5b8c\u6210\u63d0\u4ea4\u5386\u53f2\u7684\u5408\u5e76\u3002 \u6ce8\u610f\u4e8b\u9879\uff1a \u5728\u4fee\u6539Git\u7684\u5386\u53f2\u8bb0\u5f55\u65f6\uff0c\u8bf7\u786e\u4fdd\u5bf9\u81ea\u5df1\u7684\u4fee\u6539\u8db3\u591f\u81ea\u4fe1\uff0c\u56e0\u4e3a\u4fee\u6539\u5386\u53f2\u8bb0\u5f55\u6709\u53ef\u80fd\u4f1a\u5bf9\u5176\u4ed6\u4eba\u7684\u4ee3\u7801\u6709\u5f71\u54cd\u3002 […]<\/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-19181","post","type-post","status-publish","format-standard","hentry","category-16"],"_links":{"self":[{"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/posts\/19181","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=19181"}],"version-history":[{"count":0,"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/posts\/19181\/revisions"}],"wp:attachment":[{"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/media?parent=19181"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/categories?post=19181"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/tags?post=19181"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}