{"id":20078,"date":"2024-11-19T09:53:30","date_gmt":"2024-11-19T01:53:30","guid":{"rendered":"https:\/\/fwq.ai\/blog\/20078\/"},"modified":"2024-11-19T09:53:30","modified_gmt":"2024-11-19T01:53:30","slug":"git%e6%9b%b4%e6%94%b9%e7%89%88%e6%9c%ac%e6%8f%8f%e8%bf%b0","status":"publish","type":"post","link":"https:\/\/fwq.ai\/blog\/20078\/","title":{"rendered":"git\u66f4\u6539\u7248\u672c\u63cf\u8ff0"},"content":{"rendered":"

git\u662f\u76ee\u524d\u6700\u6d41\u884c\u7684\u7248\u672c\u63a7\u5236\u5de5\u5177\uff0c\u5b83\u53ef\u4ee5\u5e2e\u52a9\u5f00\u53d1\u8005\u534f\u4f5c\u3001\u8ffd\u8e2a\u4ee3\u7801\u4fee\u6539\u4ee5\u53ca\u8fd8\u539f\u9519\u8bef\u7684\u4ee3\u7801\u4fee\u6539\u3002\u5728git\u4e2d\uff0c\u7248\u672c\u63cf\u8ff0\u662f\u8bb0\u5f55\u6bcf\u6b21\u63d0\u4ea4\u7684\u91cd\u8981\u4fe1\u606f\uff0c\u5305\u62ec\u4ee3\u7801\u4fee\u6539\u7684\u5185\u5bb9\u3001\u539f\u56e0\u548c\u4f5c\u8005\u7b49\u3002\u7136\u800c\u6709\u65f6\u5019\u63d0\u4ea4\u7684\u63cf\u8ff0\u53ef\u80fd\u6709\u8bef\u6216\u8005\u4e0d\u5b8c\u6574\uff0c\u9700\u8981\u8fdb\u884c\u66f4\u6539\u3002\u672c\u6587\u5c06\u4ecb\u7ecdgit\u4e2d\u66f4\u6539\u7248\u672c\u63cf\u8ff0\u7684\u65b9\u6cd5\u3002<\/p>\n

\u65b9\u6cd5\u4e00\uff1a\u4f7f\u7528\u201c–amend\u201d\u53c2\u6570<\/h3>\n

\u5728Git\u63d0\u4ea4\u4ee3\u7801\u65f6\uff0c\u53ef\u4ee5\u4f7f\u7528\u201cgit commit\u201d\u547d\u4ee4\u52a0\u4e0a\u201c-m\u201d\u53c2\u6570\u6765\u6dfb\u52a0\u7248\u672c\u63cf\u8ff0\uff0c\u683c\u5f0f\u5982\u4e0b\uff1a<\/p>\n

$ git commit -m \"\u8fd9\u91cc\u662f\u7248\u672c\u63cf\u8ff0\"<\/pre>\n
  \u767b\u5f55\u540e\u590d\u5236   <\/p>\n
\u5982\u9700\u66f4\u6539\u5df2\u7ecf\u63d0\u4ea4\u7684\u7248\u672c\u63cf\u8ff0\uff0c\u5219\u53ef\u4ee5\u4f7f\u7528\u201c–amend\u201d\u53c2\u6570\uff0c\u683c\u5f0f\u5982\u4e0b\uff1a<\/p>\n
$ git commit --amend -m \"\u8fd9\u91cc\u662f\u4fee\u6539\u540e\u7684\u7248\u672c\u63cf\u8ff0\"<\/pre>\n
  \u767b\u5f55\u540e\u590d\u5236   <\/p>\n
\u6b64\u547d\u4ee4\u4f1a\u5f39\u51fa\u4e00\u4e2a\u7f16\u8f91\u5668\uff0c\u8ba9\u4f60\u7f16\u8f91\u65b0\u7684\u63d0\u4ea4\u4fe1\u606f\u3002\u5982\u679c\u60f3\u8981\u4fdd\u5b58\u65b0\u7684\u63d0\u4ea4\u4fe1\u606f\u5e76\u9000\u51fa\u7f16\u8f91\u5668\uff0c\u5219\u8f93\u5165\u201c:wq\u201d\uff0c\u5982\u679c\u60f3\u8981\u53d6\u6d88\u4fee\u6539\uff0c\u5219\u8f93\u5165\u201c:q\uff01\u201d\u5373\u53ef\u3002<\/p>\n
\u9700\u8981\u6ce8\u610f\u7684\u662f\uff0c\u5982\u679c\u63d0\u4ea4\u5df2\u7ecf\u88ab\u63a8\u9001\u5230\u8fdc\u7a0b\u4ed3\u5e93\uff0c\u5219\u4e0d\u5efa\u8bae\u4f7f\u7528\u8be5\u65b9\u6cd5\u6765\u66f4\u6539\u63d0\u4ea4\u4fe1\u606f\u3002<\/p>\n
\u65b9\u6cd5\u4e8c\uff1a\u4f7f\u7528\u4ea4\u4e92\u5f0f\u91cd\u5199\u5386\u53f2\u8bb0\u5f55<\/h3>\n
\u5982\u679c\u9700\u8981\u66f4\u6539\u591a\u4e2a\u63d0\u4ea4\u7684\u7248\u672c\u63cf\u8ff0\uff0c\u53ef\u4ee5\u4f7f\u7528Git\u7684\u4ea4\u4e92\u5f0f\u91cd\u5199\u5386\u53f2\u8bb0\u5f55\u529f\u80fd\u6765\u5b9e\u73b0\u3002\u4e0b\u9762\u662f\u5177\u4f53\u6b65\u9aa4\uff1a<\/p>\n
    \n
  1. \u4f7f\u7528\u201cgit rebase -i\u201d\u547d\u4ee4\u6765\u6253\u5f00\u4ea4\u4e92\u5f0f\u91cd\u5199\u5386\u53f2\u8bb0\u5f55\u7f16\u8f91\u5668\uff0c\u683c\u5f0f\u5982\u4e0b\uff1a<\/li>\n<\/ol>\n
    $ git rebase -i HEAD~N<\/pre>\n
      \u767b\u5f55\u540e\u590d\u5236   <\/p>\n
    \u201cN\u201d\u4e3a\u8981\u91cd\u5199\u7684\u63d0\u4ea4\u6570\u91cf\uff0c\u5982\u679c\u8981\u91cd\u5199\u6700\u8fd1\u76843\u6b21\u63d0\u4ea4\uff0c\u5219\u201cN\u201d\u4e3a3\u3002<\/p>\n
      \n
    1. \u5728\u4ea4\u4e92\u5f0f\u7f16\u8f91\u5668\u4e2d\u5c06\u8981\u66f4\u6539\u7684\u63d0\u4ea4\u7684\u5173\u952e\u8bcd\u4ece\u201cpick\u201d\u6539\u4e3a\u201cedit\u201d\uff0c\u5e76\u4fdd\u5b58\u9000\u51fa\u3002<\/li>\n<\/ol>\n
      pick 1234567 commit message 1\nedit 2345678 commit message 2\npick 3456789 commit message 3<\/pre>\n
        \u767b\u5f55\u540e\u590d\u5236   <\/p>\n
      \u4e0a\u9762\u7684\u4f8b\u5b50\u5c06\u7b2c\u4e8c\u4e2a\u63d0\u4ea4\u8bbe\u7f6e\u4e3a\u201cedit\u201d\u3002<\/p>\n
        \n
      1. \u4f7f\u7528\u201cgit commit –amend\u201d\u547d\u4ee4\u548c\u201cgit rebase –continue\u201d\u547d\u4ee4\u66f4\u6539\u63d0\u4ea4\u4fe1\u606f\u5e76\u7ee7\u7eed\u91cd\u5199\u5386\u53f2\u8bb0\u5f55\u3002<\/li>\n<\/ol>\n
        $ git commit --amend -m \"\u4fee\u6539\u540e\u7684\u7248\u672c\u63cf\u8ff0\"\n$ git rebase --continue<\/pre>\n
          \u767b\u5f55\u540e\u590d\u5236   <\/p>\n
          \n
        1. \u91cd\u590d\u6b65\u9aa42\u548c3\uff0c\u76f4\u5230\u6240\u6709\u8981\u66f4\u6539\u7684\u63d0\u4ea4\u7684\u7248\u672c\u63cf\u8ff0\u90fd\u4fee\u6539\u5b8c\u6210\u3002<\/li>\n
        2. \u6700\u540e\u4f7f\u7528\u201cgit push –force\u201d\u547d\u4ee4\u5c06\u4fee\u6539\u540e\u7684\u5386\u53f2\u8bb0\u5f55\u63a8\u9001\u5230\u8fdc\u7a0b\u4ed3\u5e93\u3002<\/li>\n<\/ol>\n
          $ git push --force<\/pre>\n
            \u767b\u5f55\u540e\u590d\u5236   <\/p>\n
          \u9700\u8981\u6ce8\u610f\u7684\u662f\uff0c\u4ea4\u4e92\u5f0f\u91cd\u5199\u5386\u53f2\u8bb0\u5f55\u529f\u80fd\u53ef\u4ee5\u4fee\u6539\u5386\u53f2\u8bb0\u5f55\uff0c\u56e0\u6b64\u9700\u8981\u614e\u91cd\u4f7f\u7528\uff0c\u786e\u4fdd\u4e0d\u4f1a\u5f71\u54cd\u5230\u5176\u4ed6\u5f00\u53d1\u8005\u7684\u4ee3\u7801\u3002<\/p>\n
          \u603b\u7684\u6765\u8bf4\uff0c\u901a\u8fc7\u4e0a\u8ff0\u4e24\u79cd\u65b9\u5f0f\u53ef\u4ee5\u8f83\u4e3a\u65b9\u4fbf\u5730\u4fee\u6539Git\u4e2d\u7684\u7248\u672c\u63cf\u8ff0\u3002\u5f53\u7136\uff0c\u5728\u4f7f\u7528Git\u65f6\u4e5f\u5e94\u9075\u5faa\u826f\u597d\u7684\u63d0\u4ea4\u89c4\u8303\uff0c\u4ee5\u4fbf\u66f4\u597d\u5730\u8bb0\u5f55\u4ee3\u7801\u6539\u52a8\uff0c\u65b9\u4fbf\u540e\u7eed\u7684\u534f\u540c\u5f00\u53d1\u548c\u4ee3\u7801\u7ef4\u62a4\u3002<\/p>\n
          \u4ee5\u4e0a\u5c31\u662fgit\u66f4\u6539\u7248\u672c\u63cf\u8ff0\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\u76ee\u524d\u6700\u6d41\u884c\u7684\u7248\u672c\u63a7\u5236\u5de5\u5177\uff0c\u5b83\u53ef\u4ee5\u5e2e\u52a9\u5f00\u53d1\u8005\u534f\u4f5c\u3001\u8ffd\u8e2a\u4ee3\u7801\u4fee\u6539\u4ee5\u53ca\u8fd8\u539f\u9519\u8bef\u7684\u4ee3\u7801\u4fee\u6539\u3002\u5728git\u4e2d\uff0c\u7248\u672c\u63cf\u8ff0\u662f\u8bb0\u5f55\u6bcf\u6b21\u63d0\u4ea4\u7684\u91cd\u8981\u4fe1\u606f\uff0c\u5305\u62ec\u4ee3\u7801\u4fee\u6539\u7684\u5185\u5bb9\u3001\u539f\u56e0\u548c\u4f5c\u8005\u7b49\u3002\u7136\u800c\u6709\u65f6\u5019\u63d0\u4ea4\u7684\u63cf\u8ff0\u53ef\u80fd\u6709\u8bef\u6216\u8005\u4e0d\u5b8c\u6574\uff0c\u9700\u8981\u8fdb\u884c\u66f4\u6539\u3002\u672c\u6587\u5c06\u4ecb\u7ecdgit\u4e2d\u66f4\u6539\u7248\u672c\u63cf\u8ff0\u7684\u65b9\u6cd5\u3002 \u65b9\u6cd5\u4e00\uff1a\u4f7f\u7528\u201c–amend\u201d\u53c2\u6570 \u5728Git\u63d0\u4ea4\u4ee3\u7801\u65f6\uff0c\u53ef\u4ee5\u4f7f\u7528\u201cgit commit\u201d\u547d\u4ee4\u52a0\u4e0a\u201c-m\u201d\u53c2\u6570\u6765\u6dfb\u52a0\u7248\u672c\u63cf\u8ff0\uff0c\u683c\u5f0f\u5982\u4e0b\uff1a $ git commit -m “\u8fd9\u91cc\u662f\u7248\u672c\u63cf\u8ff0” \u767b\u5f55\u540e\u590d\u5236 \u5982\u9700\u66f4\u6539\u5df2\u7ecf\u63d0\u4ea4\u7684\u7248\u672c\u63cf\u8ff0\uff0c\u5219\u53ef\u4ee5\u4f7f\u7528\u201c–amend\u201d\u53c2\u6570\uff0c\u683c\u5f0f\u5982\u4e0b\uff1a $ git commit –amend -m “\u8fd9\u91cc\u662f\u4fee\u6539\u540e\u7684\u7248\u672c\u63cf\u8ff0” \u767b\u5f55\u540e\u590d\u5236 \u6b64\u547d\u4ee4\u4f1a\u5f39\u51fa\u4e00\u4e2a\u7f16\u8f91\u5668\uff0c\u8ba9\u4f60\u7f16\u8f91\u65b0\u7684\u63d0\u4ea4\u4fe1\u606f\u3002\u5982\u679c\u60f3\u8981\u4fdd\u5b58\u65b0\u7684\u63d0\u4ea4\u4fe1\u606f\u5e76\u9000\u51fa\u7f16\u8f91\u5668\uff0c\u5219\u8f93\u5165\u201c:wq\u201d\uff0c\u5982\u679c\u60f3\u8981\u53d6\u6d88\u4fee\u6539\uff0c\u5219\u8f93\u5165\u201c:q\uff01\u201d\u5373\u53ef\u3002 \u9700\u8981\u6ce8\u610f\u7684\u662f\uff0c\u5982\u679c\u63d0\u4ea4\u5df2\u7ecf\u88ab\u63a8\u9001\u5230\u8fdc\u7a0b\u4ed3\u5e93\uff0c\u5219\u4e0d\u5efa\u8bae\u4f7f\u7528\u8be5\u65b9\u6cd5\u6765\u66f4\u6539\u63d0\u4ea4\u4fe1\u606f\u3002 \u65b9\u6cd5\u4e8c\uff1a\u4f7f\u7528\u4ea4\u4e92\u5f0f\u91cd\u5199\u5386\u53f2\u8bb0\u5f55 \u5982\u679c\u9700\u8981\u66f4\u6539\u591a\u4e2a\u63d0\u4ea4\u7684\u7248\u672c\u63cf\u8ff0\uff0c\u53ef\u4ee5\u4f7f\u7528Git\u7684\u4ea4\u4e92\u5f0f\u91cd\u5199\u5386\u53f2\u8bb0\u5f55\u529f\u80fd\u6765\u5b9e\u73b0\u3002\u4e0b\u9762\u662f\u5177\u4f53\u6b65\u9aa4\uff1a \u4f7f\u7528\u201cgit rebase -i\u201d\u547d\u4ee4\u6765\u6253\u5f00\u4ea4\u4e92\u5f0f\u91cd\u5199\u5386\u53f2\u8bb0\u5f55\u7f16\u8f91\u5668\uff0c\u683c\u5f0f\u5982\u4e0b\uff1a $ git rebase -i HEAD~N \u767b\u5f55\u540e\u590d\u5236 \u201cN\u201d\u4e3a\u8981\u91cd\u5199\u7684\u63d0\u4ea4\u6570\u91cf\uff0c\u5982\u679c\u8981\u91cd\u5199\u6700\u8fd1\u76843\u6b21\u63d0\u4ea4\uff0c\u5219\u201cN\u201d\u4e3a3\u3002 \u5728\u4ea4\u4e92\u5f0f\u7f16\u8f91\u5668\u4e2d\u5c06\u8981\u66f4\u6539\u7684\u63d0\u4ea4\u7684\u5173\u952e\u8bcd\u4ece\u201cpick\u201d\u6539\u4e3a\u201cedit\u201d\uff0c\u5e76\u4fdd\u5b58\u9000\u51fa\u3002 pick 1234567 commit message 1 edit 2345678 commit message 2 pick 3456789 commit message 3 \u767b\u5f55\u540e\u590d\u5236 \u4e0a\u9762\u7684\u4f8b\u5b50\u5c06\u7b2c\u4e8c\u4e2a\u63d0\u4ea4\u8bbe\u7f6e\u4e3a\u201cedit\u201d\u3002 \u4f7f\u7528\u201cgit commit –amend\u201d\u547d\u4ee4\u548c\u201cgit rebase –continue\u201d\u547d\u4ee4\u66f4\u6539\u63d0\u4ea4\u4fe1\u606f\u5e76\u7ee7\u7eed\u91cd\u5199\u5386\u53f2\u8bb0\u5f55\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-20078","post","type-post","status-publish","format-standard","hentry","category-16"],"_links":{"self":[{"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/posts\/20078","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=20078"}],"version-history":[{"count":0,"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/posts\/20078\/revisions"}],"wp:attachment":[{"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/media?parent=20078"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/categories?post=20078"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/tags?post=20078"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}