{"id":37440,"date":"2022-09-16T05:23:12","date_gmt":"2023-04-24T03:15:01","guid":{"rendered":"https:\/\/www.silicloud.com\/zh\/blog\/%e3%80%90git%e3%80%91%e5%85%b3%e4%ba%8efast-forward\/"},"modified":"2024-01-15T09:28:20","modified_gmt":"2024-01-15T01:28:20","slug":"%e3%80%90git%e3%80%91%e5%85%b3%e4%ba%8efast-forward","status":"publish","type":"post","link":"https:\/\/www.silicloud.com\/zh\/blog\/%e3%80%90git%e3%80%91%e5%85%b3%e4%ba%8efast-forward\/","title":{"rendered":"\u3010Git\u3011\u5173\u4e8efast-forward"},"content":{"rendered":"<h2>&#8220;\u5feb\u8fdb&#8221; \u662f\u4ec0\u4e48\u610f\u601d\uff1f<\/h2>\n<p>\u5feb\u8fdb = \u65e9\u9001\u7684\u610f\u601d<\/p>\n<p>\u5f53\u6bd4\u8f83A\u5206\u652f\u548cB\u5206\u652f\u65f6\uff0c\u524d\u8005(A)\u4ee5\u540e\u8005(B)\u4f5c\u4e3a\u63d0\u4ea4\u5185\u5bb9\u5305\u542b\uff08\u8fdb\u5c55\uff09\u7684\u5f62\u5f0f\u3002<\/p>\n<pre class=\"post-pre\"><code>git log remotes\/origin\/otoro\r\ncommit 80c803c810eab02295e29f573a3705c4787b78cd (origin\/otoro)\r\nAuthor: Atsushi Ishida &lt;gipcompany@gmail.com&gt;\r\nDate:   Mon Apr 11 23:26:35 2022 +0900\r\n\r\n    add another html\r\n\r\ncommit 9e4f4ec75d266ab405339d3ef98b1fb65dc0968d (origin\/oyster)\r\nAuthor: Atsushi Ishida &lt;gipcompany@gmail.com&gt;\r\nDate:   Fri Apr 8 22:49:43 2022 +0900\r\n\r\n    add oyster log\r\n\r\ncommit dd69904112592fb0f25f90050ec3621462b5448c (origin\/squid)\r\nAuthor: Atsushi Ishida &lt;gipcompany@gmail.com&gt;\r\nDate:   Fri Apr 8 22:27:19 2022 +0900\r\n\r\n    chagne console log with squid\r\n\r\ncommit eb590a7fce738f3c0263546ef63b40dae717550f\r\nAuthor: Atsushi Ishida &lt;gipcompany@gmail.com&gt;\r\nDate:   Fri Apr 8 22:17:05 2022 +0900\r\n\r\n    change console log output to sushi emoji\r\n\r\ncommit cb5552f23eac554c3eb3723b6aa38b857a2f470f (origin\/maguro)\r\nAuthor: Atsushi Ishida &lt;gipcompany@gmail.com&gt;\r\nDate:   Fri Apr 8 22:10:07 2022 +0900\r\n\r\n    add JavaScript Playground from https:\/\/github.com\/DiveIntoHacking\/one-liners\r\n\r\ncommit e09921bba1db763543adebc1b1e7f0b5d9511c6e (origin\/init)\r\nAuthor: Atsushi Ishida &lt;gipcompany@users.noreply.github.com&gt;\r\nDate:   Fri Apr 8 21:46:21 2022 +0900\r\n\r\n    Initial commit\r\n\r\n<\/code><\/pre>\n<p>\u5982\u4e0a\u6240\u793a\u53ef\u786e\u8ba4\uff0c\u6267\u884c git checkout -t origin\/maguro\uff0c\u5e76\u786e\u8ba4\u4e0e oroto \u7684\u5dee\u5f02\u3002<\/p>\n<pre class=\"post-pre\"><code>git-sushi on \ue0a0 maguro ? v16.20.0\r\n\u276f\r\ngit diff maguro..origin\/otoro\r\ndiff --git a\/javascript.js b\/javascript.js\r\nindex 950e532..cd85a65 100644\r\n--- a\/javascript.js\r\n+++ b\/javascript.js\r\n@@ -1 +1,2 @@\r\n-console.log('Hello, JavaScript!');\r\n+console.log('Hello, ?!');\r\n+console.log('Hello, ?!');\r\ndiff --git a\/public\/index.html b\/public\/index.html\r\nnew file mode 100644\r\nindex 0000000..e611add\r\n--- \/dev\/null\r\n+++ b\/public\/index.html\r\n@@ -0,0 +1,13 @@\r\n+&lt;!DOCTYPE html&gt;\r\n+&lt;html lang=\"ja\"&gt;\r\n+  &lt;head&gt;\r\n+    &lt;meta charset=\"UTF-8\" \/&gt;\r\n+    &lt;meta http-equiv=\"X-UA-Compatible\" content=\"IE=edge\" \/&gt;\r\n+    &lt;meta name=\"viewport\" content=\"width=device-width, initial-scale=1.0\" \/&gt;\r\n+    &lt;title&gt;I am otoro.&lt;\/title&gt;\r\n+  &lt;\/head&gt;\r\n+\r\n+  &lt;body&gt;\r\n+    I am otoro.\r\n+  &lt;\/body&gt;\r\n+&lt;\/html&gt;\r\n\r\n\r\n<\/code><\/pre>\n<pre class=\"post-pre\"><code>git-sushi on \ue0a0 maguro ? v16.20.0\r\n\u276f\r\ngit merge origin\/otoro\r\nUpdating cb5552f..80c803c\r\nFast-forward\r\n javascript.js     |  3 ++-\r\n public\/index.html | 13 +++++++++++++\r\n 2 files changed, 15 insertions(+), 1 deletion(-)\r\n create mode 100644 public\/index.html\r\n<\/code><\/pre>\n<p>\u5728\u8fd9\u91cc\uff0c\u6267\u884c\u4e86git merge origin\/otoro\u547d\u4ee4\uff0c\u4f46\u7701\u7565\u4e86git merge &#8211;ff origin\/otoro\u7684\u9009\u9879\u3002<\/p>\n<pre class=\"post-pre\"><code>git log\r\ncommit 80c803c810eab02295e29f573a3705c4787b78cd (HEAD -&gt; maguro, origin\/otoro)\r\nAuthor: Atsushi Ishida &lt;gipcompany@gmail.com&gt;\r\nDate:   Mon Apr 11 23:26:35 2022 +0900\r\n\r\n    add another html\r\n\r\ncommit 9e4f4ec75d266ab405339d3ef98b1fb65dc0968d (origin\/oyster)\r\nAuthor: Atsushi Ishida &lt;gipcompany@gmail.com&gt;\r\nDate:   Fri Apr 8 22:49:43 2022 +0900\r\n\r\n    add oyster log\r\n\r\ncommit dd69904112592fb0f25f90050ec3621462b5448c (origin\/squid)\r\nAuthor: Atsushi Ishida &lt;gipcompany@gmail.com&gt;\r\nDate:   Fri Apr 8 22:27:19 2022 +0900\r\n\r\n    chagne console log with squid\r\n\r\ncommit eb590a7fce738f3c0263546ef63b40dae717550f\r\nAuthor: Atsushi Ishida &lt;gipcompany@gmail.com&gt;\r\nDate:   Fri Apr 8 22:17:05 2022 +0900\r\n\r\n    change console log output to sushi emoji\r\n\r\ncommit cb5552f23eac554c3eb3723b6aa38b857a2f470f (origin\/maguro)\r\nAuthor: Atsushi Ishida &lt;gipcompany@gmail.com&gt;\r\nDate:   Fri Apr 8 22:10:07 2022 +0900\r\n\r\n    add JavaScript Playground from https:\/\/github.com\/DiveIntoHacking\/one-liners\r\n\r\ncommit e09921bba1db763543adebc1b1e7f0b5d9511c6e (origin\/init)\r\nAuthor: Atsushi Ishida &lt;gipcompany@users.noreply.github.com&gt;\r\nDate:   Fri Apr 8 21:46:21 2022 +0900\r\n\r\n    Initial commit\r\n\r\n<\/code><\/pre>\n","protected":false},"excerpt":{"rendered":"<p>&#8220;\u5feb\u8fdb&#8221; \u662f\u4ec0\u4e48\u610f\u601d\uff1f \u5feb\u8fdb = \u65e9\u9001\u7684\u610f\u601d \u5f53\u6bd4\u8f83A\u5206\u652f\u548cB\u5206\u652f\u65f6\uff0c\u524d\u8005(A)\u4ee5\u540e\u8005 [&hellip;]<\/p>\n","protected":false},"author":6,"featured_media":0,"comment_status":"closed","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"footnotes":""},"categories":[1],"tags":[],"class_list":["post-37440","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>\u3010Git\u3011\u5173\u4e8efast-forward - 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\u5173\u4e8efast-forward\/\" \/>\n<meta property=\"og:locale\" content=\"zh_CN\" \/>\n<meta property=\"og:type\" content=\"article\" \/>\n<meta property=\"og:title\" content=\"\u3010Git\u3011\u5173\u4e8efast-forward\" \/>\n<meta property=\"og:description\" content=\"&#8220;\u5feb\u8fdb&#8221; \u662f\u4ec0\u4e48\u610f\u601d\uff1f \u5feb\u8fdb = \u65e9\u9001\u7684\u610f\u601d \u5f53\u6bd4\u8f83A\u5206\u652f\u548cB\u5206\u652f\u65f6\uff0c\u524d\u8005(A)\u4ee5\u540e\u8005 [&hellip;]\" \/>\n<meta property=\"og:url\" content=\"https:\/\/www.silicloud.com\/zh\/blog\/\u3010git\u3011\u5173\u4e8efast-forward\/\" \/>\n<meta property=\"og:site_name\" content=\"Blog - Silicon Cloud\" \/>\n<meta property=\"article:published_time\" content=\"2023-04-24T03:15:01+00:00\" \/>\n<meta property=\"article:modified_time\" content=\"2024-01-15T01:28:20+00:00\" \/>\n<meta name=\"author\" content=\"\u6587, \u7fd4\" \/>\n<meta name=\"twitter:card\" content=\"summary_large_image\" \/>\n<meta name=\"twitter:label1\" content=\"\u4f5c\u8005\" \/>\n\t<meta name=\"twitter:data1\" content=\"\u6587, \u7fd4\" \/>\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%85%b3%e4%ba%8efast-forward\/\",\"url\":\"https:\/\/www.silicloud.com\/zh\/blog\/%e3%80%90git%e3%80%91%e5%85%b3%e4%ba%8efast-forward\/\",\"name\":\"\u3010Git\u3011\u5173\u4e8efast-forward - Blog - Silicon Cloud\",\"isPartOf\":{\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/#website\"},\"datePublished\":\"2023-04-24T03:15:01+00:00\",\"dateModified\":\"2024-01-15T01:28:20+00:00\",\"author\":{\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/64d5cc7727fffbff2f9a2a8da1de3e5c\"},\"breadcrumb\":{\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/%e3%80%90git%e3%80%91%e5%85%b3%e4%ba%8efast-forward\/#breadcrumb\"},\"inLanguage\":\"zh-Hans\",\"potentialAction\":[{\"@type\":\"ReadAction\",\"target\":[\"https:\/\/www.silicloud.com\/zh\/blog\/%e3%80%90git%e3%80%91%e5%85%b3%e4%ba%8efast-forward\/\"]}]},{\"@type\":\"BreadcrumbList\",\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/%e3%80%90git%e3%80%91%e5%85%b3%e4%ba%8efast-forward\/#breadcrumb\",\"itemListElement\":[{\"@type\":\"ListItem\",\"position\":1,\"name\":\"\u9996\u9875\",\"item\":\"https:\/\/www.silicloud.com\/zh\/blog\/\"},{\"@type\":\"ListItem\",\"position\":2,\"name\":\"\u3010Git\u3011\u5173\u4e8efast-forward\"}]},{\"@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\/64d5cc7727fffbff2f9a2a8da1de3e5c\",\"name\":\"\u6587, \u7fd4\",\"image\":{\"@type\":\"ImageObject\",\"inLanguage\":\"zh-Hans\",\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/image\/\",\"url\":\"https:\/\/secure.gravatar.com\/avatar\/920c3d673e0bccacc98e5e6b7149bb3c22edd8d39cb753e5d7d7e471498118a1?s=96&d=mm&r=g\",\"contentUrl\":\"https:\/\/secure.gravatar.com\/avatar\/920c3d673e0bccacc98e5e6b7149bb3c22edd8d39cb753e5d7d7e471498118a1?s=96&d=mm&r=g\",\"caption\":\"\u6587, \u7fd4\"},\"url\":\"https:\/\/www.silicloud.com\/zh\/blog\/author\/wenxiang\/\"},{\"@type\":\"ImageObject\",\"inLanguage\":\"zh-Hans\",\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/%e3%80%90git%e3%80%91%e5%85%b3%e4%ba%8efast-forward\/#local-main-organization-logo\",\"url\":\"\",\"contentUrl\":\"\",\"caption\":\"Blog - Silicon Cloud\"}]}<\/script>\n<!-- \/ Yoast SEO Premium plugin. -->","yoast_head_json":{"title":"\u3010Git\u3011\u5173\u4e8efast-forward - 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\u5173\u4e8efast-forward\/","og_locale":"zh_CN","og_type":"article","og_title":"\u3010Git\u3011\u5173\u4e8efast-forward","og_description":"&#8220;\u5feb\u8fdb&#8221; \u662f\u4ec0\u4e48\u610f\u601d\uff1f \u5feb\u8fdb = \u65e9\u9001\u7684\u610f\u601d \u5f53\u6bd4\u8f83A\u5206\u652f\u548cB\u5206\u652f\u65f6\uff0c\u524d\u8005(A)\u4ee5\u540e\u8005 [&hellip;]","og_url":"https:\/\/www.silicloud.com\/zh\/blog\/\u3010git\u3011\u5173\u4e8efast-forward\/","og_site_name":"Blog - Silicon Cloud","article_published_time":"2023-04-24T03:15:01+00:00","article_modified_time":"2024-01-15T01:28:20+00:00","author":"\u6587, \u7fd4","twitter_card":"summary_large_image","twitter_misc":{"\u4f5c\u8005":"\u6587, \u7fd4","\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%85%b3%e4%ba%8efast-forward\/","url":"https:\/\/www.silicloud.com\/zh\/blog\/%e3%80%90git%e3%80%91%e5%85%b3%e4%ba%8efast-forward\/","name":"\u3010Git\u3011\u5173\u4e8efast-forward - Blog - Silicon Cloud","isPartOf":{"@id":"https:\/\/www.silicloud.com\/zh\/blog\/#website"},"datePublished":"2023-04-24T03:15:01+00:00","dateModified":"2024-01-15T01:28:20+00:00","author":{"@id":"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/64d5cc7727fffbff2f9a2a8da1de3e5c"},"breadcrumb":{"@id":"https:\/\/www.silicloud.com\/zh\/blog\/%e3%80%90git%e3%80%91%e5%85%b3%e4%ba%8efast-forward\/#breadcrumb"},"inLanguage":"zh-Hans","potentialAction":[{"@type":"ReadAction","target":["https:\/\/www.silicloud.com\/zh\/blog\/%e3%80%90git%e3%80%91%e5%85%b3%e4%ba%8efast-forward\/"]}]},{"@type":"BreadcrumbList","@id":"https:\/\/www.silicloud.com\/zh\/blog\/%e3%80%90git%e3%80%91%e5%85%b3%e4%ba%8efast-forward\/#breadcrumb","itemListElement":[{"@type":"ListItem","position":1,"name":"\u9996\u9875","item":"https:\/\/www.silicloud.com\/zh\/blog\/"},{"@type":"ListItem","position":2,"name":"\u3010Git\u3011\u5173\u4e8efast-forward"}]},{"@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\/64d5cc7727fffbff2f9a2a8da1de3e5c","name":"\u6587, \u7fd4","image":{"@type":"ImageObject","inLanguage":"zh-Hans","@id":"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/image\/","url":"https:\/\/secure.gravatar.com\/avatar\/920c3d673e0bccacc98e5e6b7149bb3c22edd8d39cb753e5d7d7e471498118a1?s=96&d=mm&r=g","contentUrl":"https:\/\/secure.gravatar.com\/avatar\/920c3d673e0bccacc98e5e6b7149bb3c22edd8d39cb753e5d7d7e471498118a1?s=96&d=mm&r=g","caption":"\u6587, \u7fd4"},"url":"https:\/\/www.silicloud.com\/zh\/blog\/author\/wenxiang\/"},{"@type":"ImageObject","inLanguage":"zh-Hans","@id":"https:\/\/www.silicloud.com\/zh\/blog\/%e3%80%90git%e3%80%91%e5%85%b3%e4%ba%8efast-forward\/#local-main-organization-logo","url":"","contentUrl":"","caption":"Blog - Silicon Cloud"}]}},"_links":{"self":[{"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/posts\/37440","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\/6"}],"replies":[{"embeddable":true,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/comments?post=37440"}],"version-history":[{"count":2,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/posts\/37440\/revisions"}],"predecessor-version":[{"id":58206,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/posts\/37440\/revisions\/58206"}],"wp:attachment":[{"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/media?parent=37440"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/categories?post=37440"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/tags?post=37440"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}