\u786e\u8ba4\u76ee\u524d\u72b6\u51b5<\/p>\n
$ <\/span>git log --oneline<\/span>\r\ne0136fa (<\/span>HEAD -> master)<\/span> add3\r\n05674c6 add2\r\n9d19a21 add1\r\n<\/code><\/pre>\n\u7f16\u8f91<\/p>\n
$ git rebase -i HEAD~3\r\n<\/code><\/pre>\n\u25bc\u6539\u53d8\u4e4b\u524d<\/p>\n
..\/monaka\/git_test\/.git\/rebase-merge\/git-rebase-todo\r\npick 9d19a21 add1\r\npick 05674c6 add2\r\npick e0136fa add3\r\n<\/code><\/pre>\n\u25bc\u4fee\u6539\u540e\uff08\u5c06\u7b2c\u4e09\u4e2a\u63d0\u4ea4\u66f4\u6539\u4e3a\u7f16\u8f91\uff09<\/p>\n
..\/monaka\/git_test\/.git\/rebase-merge\/git-rebase-todo\r\npick 9d19a21 add1\r\npick 05674c6 add2\r\nedit e0136fa add3\r\n<\/code><\/pre>\n\u4fdd\u5b58\u5e76\u9000\u51fa\u540e\uff0c\u4f1a\u663e\u793a\u63a5\u4e0b\u6765\u8981\u505a\u7684\u4e8b\u60c5\u3002<\/p>\n
$ git rebase -i HEAD~3\r\nStopped at e0136fa... add3\r\nYou can amend the commit now, with\r\n\r\n git commit --amend \r\n\r\nOnce you are satisfied with your changes, run\r\n\r\n git rebase --continue\r\n<\/code><\/pre>\n\u4fee\u6539\u63d0\u4ea4\u4fe1\u606f<\/p>\n
\u2192\u6253\u5f00\u63d0\u4ea4\u6d88\u606f\u7f16\u8f91\u9875\u9762\uff0c\u8fdb\u884c\u4fee\u6539\u3002<\/p>\n
\uff08\u8fd8\u6709\uff0c\u5728\u90a3\u4e2a\u65f6\u5019\uff0c\u6211\u5728\u4e00\u4e2a\u795e\u79d8\u7684\u5730\u65b9\uff09<\/p>\n
$ git commit --amend \r\n<\/code><\/pre>\n\u4fee\u6b63\u5b8c\u6210\u540e<\/p>\n
$ git commit --amend \r\n[detached HEAD 6b9ea42] change add3 commit message\r\n Date: Sun Aug 14 12:07:04 2022 +0900\r\n 1 file changed, 0 insertions(+), 0 deletions(-)\r\n create mode 100644 third.html\r\n<\/code><\/pre>\n\u7ee7\u7eed\u8fdb\u884crebase\u3002<\/p>\n
\u6267\u884c\u4ee5\u4e0b\u64cd\u4f5c\u540e\uff0c\u56de\u5230\u539f\u59cb\u5206\u652f\u3002<\/p>\n
$ git rebase --continue\r\nSuccessfully rebased and updated refs\/heads\/master.\r\n<\/code><\/pre>\n\u786e\u8ba4<\/p>\n
$ git log --oneline\r\ne0136fa (HEAD -> master) change add3 commit message\r\n05674c6 add2\r\n9d19a21 add1\r\n<\/code><\/pre>\n\u8c03\u6574\u63d0\u4ea4\u7684\u987a\u5e8f<\/h2>\n
\u786e\u8ba4\u76ee\u524d\u72b6\u51b5<\/p>\n
$ git log --oneline\r\ne0136fa (HEAD -> master) change add3 commit message\r\n05674c6 add2\r\n9d19a21 add1\r\n<\/code><\/pre>\n\u7f16\u8f91<\/p>\n
$ git rebase -i HEAD~3\r\n<\/code><\/pre>\n\u25bc\u4fee\u6539\u524d<\/p>\n
...it_test\/.git\/rebase-merge\/git-rebase-todo Modified\r\npick 9d19a21 add1\r\npick 05674c6 add2\r\npick 6b9ea42 change add3 commit message\r\n<\/code><\/pre>\n\u25bc\u53d8\u66f4\u540e\uff08\u7b2c\u4e00\u6b21\u63d0\u4ea4\u548c\u7b2c\u4e8c\u6b21\u63d0\u4ea4\u4e92\u6362\u4f4d\u7f6e\uff09<\/p>\n
...it_test\/.git\/rebase-merge\/git-rebase-todo Modified\r\npick 05674c6 add2\r\npick 9d19a21 add1\r\npick 6b9ea42 change add3 commit message\r\n<\/code><\/pre>\n\u7f16\u8f91\u5b8c\u6210\u4e4b\u540e<\/p>\n
$ git rebase -i HEAD~3\r\nSuccessfully rebased and updated refs\/heads\/master.\r\n<\/code><\/pre>\n\u786e\u8ba4<\/p>\n
$ git log --oneline -n 3\r\nf4abf55 (HEAD -> master) change add3 commit message\r\n5c93e54 add1\r\n7777adb add2\r\n<\/code><\/pre>\n\u6574\u5408\u63d0\u4ea4<\/h2>\n
\u786e\u5b9a\u76ee\u524d\u60c5\u51b5\u3002<\/p>\n
$ git log --oneline -n 3\r\nf4abf55 (HEAD -> master) change add3 commit message\r\n5c93e54 add1\r\n7777adb add2\r\n<\/code><\/pre>\n\u7f16\u8f91<\/p>\n
$ git rebase -i HEAD~3\r\n<\/code><\/pre>\n\u25bc\u4e4b\u524d\u66f4\u6539<\/p>\n
...\/monaka\/git_test\/.git\/rebase-merge\/git-rebase-todo\r\npick 7777adb add2\r\npick 5c93e54 add1\r\npick f4abf55 change add3 commit message\r\n<\/code><\/pre>\n\u25bc\u6539\u53d8\u540e<\/p>\n
...it_test\/.git\/rebase-merge\/git-rebase-todo Modified\r\npick 7777adb add2\r\nsquash 5c93e54 add1\r\nsquash f4abf55 change add3 commit message\r\n<\/code><\/pre>\n\u63d0\u4ea4\u6d88\u606f\u7f16\u8f91\u9875\u9762\uff08\u662f\u5426\u8fdb\u884c\u66f4\u6539\u5747\u53ef\uff09<\/p>\n
\/home\/monaka\/git_test\/.git\/COMMIT_EDITMSG \r\n# This is a combination of 3 commits.\r\n# This is the 1st commit message:\r\n\r\nadd2\r\n\r\n# This is the commit message #2:\r\n\r\nadd1\r\n\r\n# This is the commit message #3:\r\n\r\nchange add3 commit message\r\n<\/code><\/pre>\n\u786e\u8ba4 (qu\u00e8<\/p>\n
$ git log --oneline\r\n3ecbd1e (HEAD -> master) add2\r\n96283d2 (origin\/master) add feature\u3000\r\n<\/code><\/pre>\n\u5c06\u63d0\u4ea4\u62c6\u5206<\/h2>\n
\u786e\u8ba4\u5f53\u524d\u72b6\u51b5<\/p>\n
$ git log --oneline\r\n3ecbd1e (HEAD -> master) add2\r\n<\/code><\/pre>\n\u7f16\u8f91<\/p>\n
$ git rebase -i HEAD~1\r\n<\/code><\/pre>\n\u25bc\u4fee\u6539\u4e4b\u524d<\/p>\n
...it_test\/.git\/rebase-merge\/git-rebase-todo Modified\r\npick 3ecbd1e add2\r\n<\/code><\/pre>\n\u4fee\u6539\u540e<\/p>\n
...it_test\/.git\/rebase-merge\/git-rebase-todo Modified\r\nedit 3ecbd1e add2\r\n<\/code><\/pre>\n\u53d6\u6d88\u88ab\u6807\u8bb0\u4e3a”edit”\u7684\u63d0\u4ea4\uff0c\u5c06\u5176\u6062\u590d\u4e3a\u672a\u6682\u5b58\u72b6\u6001\u3002<\/p>\n
\n- \n
git reset \u30b3\u30de\u30f3\u30c9\uff1a\u30b3\u30df\u30c3\u30c8\u3092\u53d6\u308a\u6d88\u3057\u3066\u30b9\u30c6\u30fc\u30b8\u30f3\u30b0\u3057\u3066\u3044\u306a\u3044\u72b6\u6cc1\u307e\u3067\u623b\u3059<\/ul>\n<\/li>\n<\/ul>\n <\/p>\n
HEAD^\uff08\u30ad\u30e3\u30ec\u30c3\u30c8\uff09\uff1aedit\u3068\u8a18\u8f09\u3057\u305f\u30b3\u30df\u30c3\u30c8\u3092\u6307\u3059<\/ul>\n
$ git reset HEAD^\r\n<\/code><\/pre>\n\u786e\u8ba4 (qu\u00e8<\/p>\n
$ git status\r\ninteractive rebase in progress; onto 96283d2\r\nLast command done (1 command done):\r\n edit 3ecbd1e add2\r\nNo commands remaining.\r\nYou are currently editing a commit while rebasing branch 'master' on '96283d2'.\r\n (use \"git commit --amend\" to amend the current commit)\r\n (use \"git rebase --continue\" once you are satisfied with your changes)\r\n\r\nUntracked files:\r\n (use \"git add <file>...\" to include in what will be committed)\r\n first.html\r\n second.html\r\n third.html\r\n\r\nnothing added to commit but untracked files present (use \"git add\" to track)\r\n<\/code><\/pre>\n\u63d0\u4ea4first.html\u548csecond.html\u6587\u4ef6<\/p>\n
$ git add first.html second.html \r\n$ git commit -m 'add1&2'\r\n[detached HEAD c8c96fd] add1&2\r\n 2 files changed, 0 insertions(+), 0 deletions(-)\r\n create mode 100644 first.html\r\n create mode 100644 second.html\r\n<\/code><\/pre>\n\u63d0\u4ea4third.html\u6587\u4ef6<\/p>\n
$ git add third.html \r\n$ git commit -m 'add3'\r\n[detached HEAD eb18196] add3\r\n 1 file changed, 0 insertions(+), 0 deletions(-)\r\n create mode 100644 third.html\r\n<\/code><\/pre>\n\u91cd\u505a<\/p>\n
$ git rebase --continue\r\nSuccessfully rebased and updated refs\/heads\/master.\r\n<\/code><\/pre>\n\u786e\u8ba4<\/p>\n
$ git log --oneline\r\neb18196 (HEAD -> master) add3\r\nc8c96fd add1&2\r\n<\/code><\/pre>\n\u5220\u9664\u63d0\u4ea4<\/h2>\n
\u786e\u8ba4<\/p>\n
$ git log --oneline -n 3\r\neb18196 (HEAD -> master, origin\/master) add3\r\nc8c96fd add1&2\r\n96283d2 add feature\r\n<\/code><\/pre>\n\u7f16\u8f91<\/p>\n
$ git rebase -i HEAD~3\r\n<\/code><\/pre>\n\u25bc\u6539\u52a8\u4e4b\u524d<\/p>\n
...\/monaka\/git_test\/.git\/rebase-merge\/git-rebase-todo\r\npick 96283d2 add feature\r\npick c8c96fd add1&2\r\npick eb18196 add3\r\n<\/code><\/pre>\n\u25bc\u6539\u53d8\u4e4b\u540e<\/p>\n
...it_test\/.git\/rebase-merge\/git-rebase-todo Modified\r\npick 96283d2 add feature\r\n<\/code><\/pre>\n\u786e\u8ba4<\/p>\n
$ git log --oneline -n 3\r\n96283d2 (HEAD -> master) add feature\r\n<\/code><\/pre>\n\u8bf7\u53c2\u9605<\/h3>\n
<\/p>\n","protected":false},"excerpt":{"rendered":"
\u66f4\u6539\u63d0\u4ea4\u4fe1\u606f \u786e\u8ba4\u76ee\u524d\u72b6\u51b5 $ git log –oneline e0136fa (HEAD -> m […]<\/p>\n","protected":false},"author":10,"featured_media":0,"comment_status":"closed","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"footnotes":""},"categories":[1],"tags":[],"class_list":["post-37354","post","type-post","status-publish","format-standard","hentry","category-uncategorized"],"yoast_head":"\n
\u3010Git\u3011\u53d8\u57fa - 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\/\u3010git\u3011\u53d8\u57fa\/\" \/>\n<meta property=\"og:locale\" content=\"zh_CN\" \/>\n<meta property=\"og:type\" content=\"article\" \/>\n<meta property=\"og:title\" content=\"\u3010Git\u3011\u53d8\u57fa\" \/>\n<meta property=\"og:description\" content=\"\u66f4\u6539\u63d0\u4ea4\u4fe1\u606f \u786e\u8ba4\u76ee\u524d\u72b6\u51b5 $ git log --oneline e0136fa (HEAD -> m […]\" \/>\n<meta property=\"og:url\" content=\"https:\/\/www.silicloud.com\/zh\/blog\/\u3010git\u3011\u53d8\u57fa\/\" \/>\n<meta property=\"og:site_name\" content=\"Blog - Silicon Cloud\" \/>\n<meta property=\"article:published_time\" content=\"2023-06-01T03:24:11+00:00\" \/>\n<meta property=\"article:modified_time\" content=\"2024-04-30T03:21:37+00:00\" \/>\n<meta name=\"author\" content=\"\u5b87, \u534e\" \/>\n<meta name=\"twitter:card\" content=\"summary_large_image\" \/>\n<meta name=\"twitter:label1\" content=\"\u4f5c\u8005\" \/>\n\t<meta name=\"twitter:data1\" content=\"\u5b87, \u534e\" \/>\n\t<meta name=\"twitter:label2\" content=\"\u9884\u8ba1\u9605\u8bfb\u65f6\u95f4\" \/>\n\t<meta name=\"twitter:data2\" content=\"3 \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\/%e3%80%90git%e3%80%91%e5%8f%98%e5%9f%ba\/\",\"url\":\"https:\/\/www.silicloud.com\/zh\/blog\/%e3%80%90git%e3%80%91%e5%8f%98%e5%9f%ba\/\",\"name\":\"\u3010Git\u3011\u53d8\u57fa - Blog - Silicon Cloud\",\"isPartOf\":{\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/#website\"},\"datePublished\":\"2023-06-01T03:24:11+00:00\",\"dateModified\":\"2024-04-30T03:21:37+00:00\",\"author\":{\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/513018e4e121d3add1b7c5de8be21458\"},\"breadcrumb\":{\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/%e3%80%90git%e3%80%91%e5%8f%98%e5%9f%ba\/#breadcrumb\"},\"inLanguage\":\"zh-Hans\",\"potentialAction\":[{\"@type\":\"ReadAction\",\"target\":[\"https:\/\/www.silicloud.com\/zh\/blog\/%e3%80%90git%e3%80%91%e5%8f%98%e5%9f%ba\/\"]}]},{\"@type\":\"BreadcrumbList\",\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/%e3%80%90git%e3%80%91%e5%8f%98%e5%9f%ba\/#breadcrumb\",\"itemListElement\":[{\"@type\":\"ListItem\",\"position\":1,\"name\":\"\u9996\u9875\",\"item\":\"https:\/\/www.silicloud.com\/zh\/blog\/\"},{\"@type\":\"ListItem\",\"position\":2,\"name\":\"\u3010Git\u3011\u53d8\u57fa\"}]},{\"@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\/513018e4e121d3add1b7c5de8be21458\",\"name\":\"\u5b87, \u534e\",\"image\":{\"@type\":\"ImageObject\",\"inLanguage\":\"zh-Hans\",\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/image\/\",\"url\":\"https:\/\/secure.gravatar.com\/avatar\/63cd45cbc05a35fc4ff7637a163c83c4962ef58d27472726c3a3e0c9c5194f0f?s=96&d=mm&r=g\",\"contentUrl\":\"https:\/\/secure.gravatar.com\/avatar\/63cd45cbc05a35fc4ff7637a163c83c4962ef58d27472726c3a3e0c9c5194f0f?s=96&d=mm&r=g\",\"caption\":\"\u5b87, \u534e\"},\"url\":\"https:\/\/www.silicloud.com\/zh\/blog\/author\/yuhua\/\"},{\"@type\":\"ImageObject\",\"inLanguage\":\"zh-Hans\",\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/%e3%80%90git%e3%80%91%e5%8f%98%e5%9f%ba\/#local-main-organization-logo\",\"url\":\"\",\"contentUrl\":\"\",\"caption\":\"Blog - Silicon Cloud\"}]}<\/script>\n<!-- \/ Yoast SEO Premium plugin. -->","yoast_head_json":{"title":"\u3010Git\u3011\u53d8\u57fa - 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\/\u3010git\u3011\u53d8\u57fa\/","og_locale":"zh_CN","og_type":"article","og_title":"\u3010Git\u3011\u53d8\u57fa","og_description":"\u66f4\u6539\u63d0\u4ea4\u4fe1\u606f \u786e\u8ba4\u76ee\u524d\u72b6\u51b5 $ git log --oneline e0136fa (HEAD -> m […]","og_url":"https:\/\/www.silicloud.com\/zh\/blog\/\u3010git\u3011\u53d8\u57fa\/","og_site_name":"Blog - Silicon Cloud","article_published_time":"2023-06-01T03:24:11+00:00","article_modified_time":"2024-04-30T03:21:37+00:00","author":"\u5b87, \u534e","twitter_card":"summary_large_image","twitter_misc":{"\u4f5c\u8005":"\u5b87, \u534e","\u9884\u8ba1\u9605\u8bfb\u65f6\u95f4":"3 \u5206"},"schema":{"@context":"https:\/\/schema.org","@graph":[{"@type":"WebPage","@id":"https:\/\/www.silicloud.com\/zh\/blog\/%e3%80%90git%e3%80%91%e5%8f%98%e5%9f%ba\/","url":"https:\/\/www.silicloud.com\/zh\/blog\/%e3%80%90git%e3%80%91%e5%8f%98%e5%9f%ba\/","name":"\u3010Git\u3011\u53d8\u57fa - Blog - Silicon Cloud","isPartOf":{"@id":"https:\/\/www.silicloud.com\/zh\/blog\/#website"},"datePublished":"2023-06-01T03:24:11+00:00","dateModified":"2024-04-30T03:21:37+00:00","author":{"@id":"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/513018e4e121d3add1b7c5de8be21458"},"breadcrumb":{"@id":"https:\/\/www.silicloud.com\/zh\/blog\/%e3%80%90git%e3%80%91%e5%8f%98%e5%9f%ba\/#breadcrumb"},"inLanguage":"zh-Hans","potentialAction":[{"@type":"ReadAction","target":["https:\/\/www.silicloud.com\/zh\/blog\/%e3%80%90git%e3%80%91%e5%8f%98%e5%9f%ba\/"]}]},{"@type":"BreadcrumbList","@id":"https:\/\/www.silicloud.com\/zh\/blog\/%e3%80%90git%e3%80%91%e5%8f%98%e5%9f%ba\/#breadcrumb","itemListElement":[{"@type":"ListItem","position":1,"name":"\u9996\u9875","item":"https:\/\/www.silicloud.com\/zh\/blog\/"},{"@type":"ListItem","position":2,"name":"\u3010Git\u3011\u53d8\u57fa"}]},{"@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\/513018e4e121d3add1b7c5de8be21458","name":"\u5b87, \u534e","image":{"@type":"ImageObject","inLanguage":"zh-Hans","@id":"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/image\/","url":"https:\/\/secure.gravatar.com\/avatar\/63cd45cbc05a35fc4ff7637a163c83c4962ef58d27472726c3a3e0c9c5194f0f?s=96&d=mm&r=g","contentUrl":"https:\/\/secure.gravatar.com\/avatar\/63cd45cbc05a35fc4ff7637a163c83c4962ef58d27472726c3a3e0c9c5194f0f?s=96&d=mm&r=g","caption":"\u5b87, \u534e"},"url":"https:\/\/www.silicloud.com\/zh\/blog\/author\/yuhua\/"},{"@type":"ImageObject","inLanguage":"zh-Hans","@id":"https:\/\/www.silicloud.com\/zh\/blog\/%e3%80%90git%e3%80%91%e5%8f%98%e5%9f%ba\/#local-main-organization-logo","url":"","contentUrl":"","caption":"Blog - Silicon Cloud"}]}},"_links":{"self":[{"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/posts\/37354","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\/10"}],"replies":[{"embeddable":true,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/comments?post=37354"}],"version-history":[{"count":2,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/posts\/37354\/revisions"}],"predecessor-version":[{"id":91605,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/posts\/37354\/revisions\/91605"}],"wp:attachment":[{"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/media?parent=37354"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/categories?post=37354"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/tags?post=37354"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}