{"id":37512,"date":"2023-10-03T02:19:57","date_gmt":"2022-08-19T07:01:52","guid":{"rendered":"https:\/\/www.silicloud.com\/zh\/blog\/git%e7%9a%84%e4%bd%bf%e7%94%a8%e6%96%b9%e6%b3%95-6\/"},"modified":"2024-01-15T09:30:58","modified_gmt":"2024-01-15T01:30:58","slug":"git%e7%9a%84%e4%bd%bf%e7%94%a8%e6%96%b9%e6%b3%95-6","status":"publish","type":"post","link":"https:\/\/www.silicloud.com\/zh\/blog\/git%e7%9a%84%e4%bd%bf%e7%94%a8%e6%96%b9%e6%b3%95-6\/","title":{"rendered":"Git\u7684\u4f7f\u7528\u65b9\u6cd5"},"content":{"rendered":"<p>\u653e\u5f03\u6240\u6709\u672a\u6dfb\u52a0\u7684\u66f4\u6539\u3002<\/p>\n<h2>\u6211\u4e5f\u60f3\u63d0\u4ea4\u8fd9\u4e2a\uff01<\/h2>\n<p>\u2192\u662f\u4e4b\u524d\u7684\u63d0\u4ea4\u5417\uff1f<br \/>\n\u2192\u662f \u2192\u8fd8\u6765\u5f97\u53ca\uff01 git add \u6587\u4ef6 git commit &#8211;amend -m &#8220;\u76f8\u540c\u7684\u6d88\u606f&#8221;<br \/>\n\u2192\u4e0d\u662f \u2192\u53ea\u80fd\u8fdb\u884crebase\u3002<br \/>\n\u901a\u8fc7git log\u786e\u8ba4\u3002\u53ef\u4ee5\u901a\u8fc7git diff HEAD~N\u67e5\u770b\u6bcf\u4e2a\u63d0\u4ea4\u7684\u4ee3\u7801\u66f4\u6539\u3002\u6216\u8005\u53ef\u4ee5\u4f7f\u7528SourceTree\u3002<br \/>\n\u2192\u901a\u8fc7git rebase -i HEAD~N\uff0c\u5c06\u8981\u63d2\u5165\u66f4\u6539\u7684\u63d0\u4ea4\u90e8\u5206\u63a8\u9001\u4e3apush \u2192 edit\u3002<br \/>\n\u2192\u901a\u8fc7git log\u786e\u8ba4HEAD\u662f\u5426\u5728\u8be5\u63d0\u4ea4\u4e0a\u3002\u8fd9\u79cd\u72b6\u6001\u8868\u793a\u76ee\u6807\u63d0\u4ea4\u5df2\u5b8c\u6210\u3002<br \/>\n\u2192\u901a\u8fc7git diff HEAD^\u518d\u6b21\u786e\u8ba4\u3002\u662f\u5426\u5c06\u66f4\u6539\u63d2\u5165\u8be5\u63d0\u4ea4\uff1f<br \/>\n\u2192\u901a\u8fc7\u6267\u884cgit reset &#8211;soft HEAD\uff0c\u4f7fgit add\u7684\u66f4\u6539\u56de\u5230\u5c1a\u672a\u63d0\u4ea4\u7684\u72b6\u6001\u3002\u5728\u8fd9\u91cc\u8fdb\u884c\u66f4\u6539\uff0c\u7136\u540e\u6267\u884cgit add \u2192 git commit\u3002<br \/>\n\u2192\u5982\u679c\u6ca1\u6709\u95ee\u9898\uff0c\u6267\u884cgit rebase &#8211;continue\u3002\u8fd9\u6837\u5c31\u5927\u529f\u544a\u6210\u4e86\u3002<br \/>\n\u5728\u6b64\u8fc7\u7a0b\u4e2d\uff0c\u5982\u679c\u5df2\u7ecf\u56de\u6eaf\u5230\u5df2\u5728\u8fdc\u7a0b\u63a8\u9001\u7684\u63d0\u4ea4\uff0c\u90a3\u4e48\u5c31\u9700\u8981\u6267\u884cgit push -f\uff0c\u5f3a\u5236\u63a8\u9001\u3002\u5982\u679c\u4e0e\u4ed6\u4eba\u5171\u540c\u7f16\u8f91\u5b58\u50a8\u5e93\uff0c\u7edd\u5bf9\u8981\u907f\u514d\u672a\u7ecf\u5141\u8bb8\u8fdb\u884c\u64cd\u4f5c\u3002<\/p>\n<p>\u53c2\u8003\u94fe\u63a5\uff1a<br \/>\nhttps:\/\/qiita.com\/310ma3\/items\/e0ec74b47c6c219f2a8b<br \/>\nhttps:\/\/backlog.com\/ja\/git-tutorial\/stepup\/13\/<br \/>\nhttps:\/\/qiita.com\/FrogWoman\/items\/31cd5df4c4a5ae23f7e0<br \/>\nhttps:\/\/backlog.com\/ja\/git-tutorial\/stepup\/28\/<br \/>\nhttps:\/\/git-scm.com\/docs\/git-rebase<\/p>\n<p>\u4ee5\u4e0b\u662f\u5bf9\u4e24\u4e2a\u94fe\u63a5\u7684\u4e2d\u6587\u63cf\u8ff0\uff0c<\/p>\n<p>\u94fe\u63a51: https:\/\/qiita.com\/zaneli@github\/items\/8d519a229653a2ed9ec6<\/p>\n<p>\u8fd9\u7bc7\u6587\u7ae0\u662f\u5173\u4e8e\u5982\u4f55\u4f7f\u7528git\u547d\u4ee4\u4e2d\u7684rebase -i\u9009\u9879\u7684\u6559\u7a0b\u3002\u4ed6\u8be6\u7ec6\u4ecb\u7ecd\u4e86\u8fd9\u4e2a\u9009\u9879\u7684\u4f7f\u7528\u65b9\u6cd5\u4ee5\u53ca\u5982\u4f55\u5728\u7248\u672c\u63a7\u5236\u4e2d\u4fee\u6539commit\u3002\u5982\u679c\u60a8\u5bf9git\u547d\u4ee4\u6709\u5174\u8da3\uff0c\u8fd9\u7bc7\u6587\u7ae0\u5c06\u4f1a\u5bf9\u60a8\u6709\u6240\u5e2e\u52a9\u3002<\/p>\n<p>\u94fe\u63a52: http:\/\/www-creators.com\/archives\/5238#git_rebase_-i<\/p>\n<p>\u8fd9\u7bc7\u6587\u7ae0\u662f\u6709\u5173git\u547d\u4ee4\u4e2drebase -i\u9009\u9879\u7684\u89e3\u91ca\u3002\u5b83\u89e3\u91ca\u4e86\u8fd9\u4e2a\u9009\u9879\u5982\u4f55\u5728git\u4e2d\u4f7f\u7528\u4ee5\u53ca\u5982\u4f55\u8fdb\u884c\u4ea4\u4e92\u5f0f\u7684rebase\u3002\u5982\u679c\u60a8\u60f3\u4e86\u89e3\u5982\u4f55\u5728git\u4e2d\u66f4\u597d\u5730\u7ba1\u7406\u60a8\u7684\u7248\u672c\u63a7\u5236\uff0c\u8fd9\u7bc7\u6587\u7ae0\u662f\u4e00\u4e2a\u4e0d\u9519\u7684\u53c2\u8003\u3002<\/p>\n","protected":false},"excerpt":{"rendered":"<p>\u653e\u5f03\u6240\u6709\u672a\u6dfb\u52a0\u7684\u66f4\u6539\u3002 \u6211\u4e5f\u60f3\u63d0\u4ea4\u8fd9\u4e2a\uff01 \u2192\u662f\u4e4b\u524d\u7684\u63d0\u4ea4\u5417\uff1f \u2192\u662f \u2192\u8fd8\u6765\u5f97\u53ca\uff01 git add \u6587\u4ef6 git [&hellip;]<\/p>\n","protected":false},"author":5,"featured_media":0,"comment_status":"closed","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"footnotes":""},"categories":[1],"tags":[],"class_list":["post-37512","post","type-post","status-publish","format-standard","hentry","category-uncategorized"],"yoast_head":"<!-- This site is optimized with the Yoast SEO Premium plugin v21.5 (Yoast SEO v21.5) - https:\/\/yoast.com\/wordpress\/plugins\/seo\/ -->\n<title>Git\u7684\u4f7f\u7528\u65b9\u6cd5 - Blog - Silicon Cloud<\/title>\n<meta name=\"robots\" content=\"index, follow, max-snippet:-1, max-image-preview:large, max-video-preview:-1\" \/>\n<link rel=\"canonical\" href=\"https:\/\/www.silicloud.com\/zh\/blog\/git\u7684\u4f7f\u7528\u65b9\u6cd5-6\/\" \/>\n<meta property=\"og:locale\" content=\"zh_CN\" \/>\n<meta property=\"og:type\" content=\"article\" \/>\n<meta property=\"og:title\" content=\"Git\u7684\u4f7f\u7528\u65b9\u6cd5\" \/>\n<meta property=\"og:description\" content=\"\u653e\u5f03\u6240\u6709\u672a\u6dfb\u52a0\u7684\u66f4\u6539\u3002 \u6211\u4e5f\u60f3\u63d0\u4ea4\u8fd9\u4e2a\uff01 \u2192\u662f\u4e4b\u524d\u7684\u63d0\u4ea4\u5417\uff1f \u2192\u662f \u2192\u8fd8\u6765\u5f97\u53ca\uff01 git add \u6587\u4ef6 git [&hellip;]\" \/>\n<meta property=\"og:url\" content=\"https:\/\/www.silicloud.com\/zh\/blog\/git\u7684\u4f7f\u7528\u65b9\u6cd5-6\/\" \/>\n<meta property=\"og:site_name\" content=\"Blog - Silicon Cloud\" \/>\n<meta property=\"article:published_time\" content=\"2022-08-19T07:01:52+00:00\" \/>\n<meta property=\"article:modified_time\" content=\"2024-01-15T01:30:58+00:00\" \/>\n<meta name=\"author\" content=\"\u6e05, \u5b87\" \/>\n<meta name=\"twitter:card\" content=\"summary_large_image\" \/>\n<meta name=\"twitter:label1\" content=\"\u4f5c\u8005\" \/>\n\t<meta name=\"twitter:data1\" content=\"\u6e05, \u5b87\" \/>\n\t<meta name=\"twitter:label2\" content=\"\u9884\u8ba1\u9605\u8bfb\u65f6\u95f4\" \/>\n\t<meta name=\"twitter:data2\" content=\"1 \u5206\" \/>\n<script type=\"application\/ld+json\" class=\"yoast-schema-graph\">{\"@context\":\"https:\/\/schema.org\",\"@graph\":[{\"@type\":\"WebPage\",\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/git%e7%9a%84%e4%bd%bf%e7%94%a8%e6%96%b9%e6%b3%95-6\/\",\"url\":\"https:\/\/www.silicloud.com\/zh\/blog\/git%e7%9a%84%e4%bd%bf%e7%94%a8%e6%96%b9%e6%b3%95-6\/\",\"name\":\"Git\u7684\u4f7f\u7528\u65b9\u6cd5 - Blog - Silicon Cloud\",\"isPartOf\":{\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/#website\"},\"datePublished\":\"2022-08-19T07:01:52+00:00\",\"dateModified\":\"2024-01-15T01:30:58+00:00\",\"author\":{\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/1a6ecd3d914d22a5ac32791ffc1fbd8e\"},\"breadcrumb\":{\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/git%e7%9a%84%e4%bd%bf%e7%94%a8%e6%96%b9%e6%b3%95-6\/#breadcrumb\"},\"inLanguage\":\"zh-Hans\",\"potentialAction\":[{\"@type\":\"ReadAction\",\"target\":[\"https:\/\/www.silicloud.com\/zh\/blog\/git%e7%9a%84%e4%bd%bf%e7%94%a8%e6%96%b9%e6%b3%95-6\/\"]}]},{\"@type\":\"BreadcrumbList\",\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/git%e7%9a%84%e4%bd%bf%e7%94%a8%e6%96%b9%e6%b3%95-6\/#breadcrumb\",\"itemListElement\":[{\"@type\":\"ListItem\",\"position\":1,\"name\":\"\u9996\u9875\",\"item\":\"https:\/\/www.silicloud.com\/zh\/blog\/\"},{\"@type\":\"ListItem\",\"position\":2,\"name\":\"Git\u7684\u4f7f\u7528\u65b9\u6cd5\"}]},{\"@type\":\"WebSite\",\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/#website\",\"url\":\"https:\/\/www.silicloud.com\/zh\/blog\/\",\"name\":\"Blog - Silicon Cloud\",\"description\":\"\",\"inLanguage\":\"zh-Hans\"},{\"@type\":\"Person\",\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/1a6ecd3d914d22a5ac32791ffc1fbd8e\",\"name\":\"\u6e05, \u5b87\",\"image\":{\"@type\":\"ImageObject\",\"inLanguage\":\"zh-Hans\",\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/image\/\",\"url\":\"https:\/\/secure.gravatar.com\/avatar\/4b2016c18459a605fc469c7566608f5686491baa112d0871ee613f61b7210565?s=96&d=mm&r=g\",\"contentUrl\":\"https:\/\/secure.gravatar.com\/avatar\/4b2016c18459a605fc469c7566608f5686491baa112d0871ee613f61b7210565?s=96&d=mm&r=g\",\"caption\":\"\u6e05, \u5b87\"},\"url\":\"https:\/\/www.silicloud.com\/zh\/blog\/author\/qingyu\/\"},{\"@type\":\"ImageObject\",\"inLanguage\":\"zh-Hans\",\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/git%e7%9a%84%e4%bd%bf%e7%94%a8%e6%96%b9%e6%b3%95-6\/#local-main-organization-logo\",\"url\":\"\",\"contentUrl\":\"\",\"caption\":\"Blog - Silicon Cloud\"}]}<\/script>\n<!-- \/ Yoast SEO Premium plugin. -->","yoast_head_json":{"title":"Git\u7684\u4f7f\u7528\u65b9\u6cd5 - Blog - Silicon Cloud","robots":{"index":"index","follow":"follow","max-snippet":"max-snippet:-1","max-image-preview":"max-image-preview:large","max-video-preview":"max-video-preview:-1"},"canonical":"https:\/\/www.silicloud.com\/zh\/blog\/git\u7684\u4f7f\u7528\u65b9\u6cd5-6\/","og_locale":"zh_CN","og_type":"article","og_title":"Git\u7684\u4f7f\u7528\u65b9\u6cd5","og_description":"\u653e\u5f03\u6240\u6709\u672a\u6dfb\u52a0\u7684\u66f4\u6539\u3002 \u6211\u4e5f\u60f3\u63d0\u4ea4\u8fd9\u4e2a\uff01 \u2192\u662f\u4e4b\u524d\u7684\u63d0\u4ea4\u5417\uff1f \u2192\u662f \u2192\u8fd8\u6765\u5f97\u53ca\uff01 git add \u6587\u4ef6 git [&hellip;]","og_url":"https:\/\/www.silicloud.com\/zh\/blog\/git\u7684\u4f7f\u7528\u65b9\u6cd5-6\/","og_site_name":"Blog - Silicon Cloud","article_published_time":"2022-08-19T07:01:52+00:00","article_modified_time":"2024-01-15T01:30:58+00:00","author":"\u6e05, \u5b87","twitter_card":"summary_large_image","twitter_misc":{"\u4f5c\u8005":"\u6e05, \u5b87","\u9884\u8ba1\u9605\u8bfb\u65f6\u95f4":"1 \u5206"},"schema":{"@context":"https:\/\/schema.org","@graph":[{"@type":"WebPage","@id":"https:\/\/www.silicloud.com\/zh\/blog\/git%e7%9a%84%e4%bd%bf%e7%94%a8%e6%96%b9%e6%b3%95-6\/","url":"https:\/\/www.silicloud.com\/zh\/blog\/git%e7%9a%84%e4%bd%bf%e7%94%a8%e6%96%b9%e6%b3%95-6\/","name":"Git\u7684\u4f7f\u7528\u65b9\u6cd5 - Blog - Silicon Cloud","isPartOf":{"@id":"https:\/\/www.silicloud.com\/zh\/blog\/#website"},"datePublished":"2022-08-19T07:01:52+00:00","dateModified":"2024-01-15T01:30:58+00:00","author":{"@id":"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/1a6ecd3d914d22a5ac32791ffc1fbd8e"},"breadcrumb":{"@id":"https:\/\/www.silicloud.com\/zh\/blog\/git%e7%9a%84%e4%bd%bf%e7%94%a8%e6%96%b9%e6%b3%95-6\/#breadcrumb"},"inLanguage":"zh-Hans","potentialAction":[{"@type":"ReadAction","target":["https:\/\/www.silicloud.com\/zh\/blog\/git%e7%9a%84%e4%bd%bf%e7%94%a8%e6%96%b9%e6%b3%95-6\/"]}]},{"@type":"BreadcrumbList","@id":"https:\/\/www.silicloud.com\/zh\/blog\/git%e7%9a%84%e4%bd%bf%e7%94%a8%e6%96%b9%e6%b3%95-6\/#breadcrumb","itemListElement":[{"@type":"ListItem","position":1,"name":"\u9996\u9875","item":"https:\/\/www.silicloud.com\/zh\/blog\/"},{"@type":"ListItem","position":2,"name":"Git\u7684\u4f7f\u7528\u65b9\u6cd5"}]},{"@type":"WebSite","@id":"https:\/\/www.silicloud.com\/zh\/blog\/#website","url":"https:\/\/www.silicloud.com\/zh\/blog\/","name":"Blog - Silicon Cloud","description":"","inLanguage":"zh-Hans"},{"@type":"Person","@id":"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/1a6ecd3d914d22a5ac32791ffc1fbd8e","name":"\u6e05, \u5b87","image":{"@type":"ImageObject","inLanguage":"zh-Hans","@id":"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/image\/","url":"https:\/\/secure.gravatar.com\/avatar\/4b2016c18459a605fc469c7566608f5686491baa112d0871ee613f61b7210565?s=96&d=mm&r=g","contentUrl":"https:\/\/secure.gravatar.com\/avatar\/4b2016c18459a605fc469c7566608f5686491baa112d0871ee613f61b7210565?s=96&d=mm&r=g","caption":"\u6e05, \u5b87"},"url":"https:\/\/www.silicloud.com\/zh\/blog\/author\/qingyu\/"},{"@type":"ImageObject","inLanguage":"zh-Hans","@id":"https:\/\/www.silicloud.com\/zh\/blog\/git%e7%9a%84%e4%bd%bf%e7%94%a8%e6%96%b9%e6%b3%95-6\/#local-main-organization-logo","url":"","contentUrl":"","caption":"Blog - Silicon Cloud"}]}},"_links":{"self":[{"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/posts\/37512","targetHints":{"allow":["GET"]}}],"collection":[{"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/users\/5"}],"replies":[{"embeddable":true,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/comments?post=37512"}],"version-history":[{"count":2,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/posts\/37512\/revisions"}],"predecessor-version":[{"id":58225,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/posts\/37512\/revisions\/58225"}],"wp:attachment":[{"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/media?parent=37512"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/categories?post=37512"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/tags?post=37512"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}