{"id":3603,"date":"2023-06-28T20:58:51","date_gmt":"2023-06-28T11:58:51","guid":{"rendered":"http:\/\/attacktube.com\/?p=3603"},"modified":"2023-06-29T13:18:20","modified_gmt":"2023-06-29T04:18:20","slug":"%e3%80%90git%e3%80%91fast-forward","status":"publish","type":"post","link":"https:\/\/attacktube.com\/?p=3603","title":{"rendered":"\u3010Git\u3011Fast-forward"},"content":{"rendered":"\n<p>\u300cgit pull\u300d\u3092\u3057\u305f\u3068\u304d\u306b\u3001\u300cFast-forward\u300d\u8868\u793a\u304c\u51fa\u305f\u3002<br>\u300cgit pull\u300d\u306f\u30de\u30fc\u30b8\u306e\u4e00\u7a2e\u3067\u3042\u308b\u3002<br>pull  = fetch + merge<br>\u30c7\u30fc\u30bf\u3092\u6301\u3063\u3066\u304f\u308b\u306e\u304cfetch\u3001\u30c7\u30fc\u30bf\u3092\u9001\u308b\u306e\u304cpush\u3067\u3042\u308b\u3002<br>fetch\u306f\u30ea\u30e2\u30fc\u30c8\u30ea\u30dd\u304b\u3089\u60c5\u5831\u53d6\u5f97\u3060\u3051\u3092\u884c\u3046\u3002<br>\u3053\u306e\u30ea\u30e2\u30fc\u30c8\u30ea\u30dd\u30b8\u304b\u3089\u53d6\u5f97\u3057\u305f\u60c5\u5831\u3092\u30ed\u30fc\u30ab\u30eb\u30ea\u30dd\u306b\u53cd\u6620\u3055\u305b\u308b\u306e\u306fmerge\u3067\u3042\u308b\u3002<br><br>Fast-forward\u304c\u6b21\u306e\u3088\u3046\u306a\u7406\u89e3\u3067\u3044\u3044\u3068\u601d\u3046\u3002<br><br>\u300cFast-forward\u300d\u306f\u30de\u30fc\u30b8\u304c&#8221;\u65e9\u9001\u308a&#8221;\u3067\u884c\u308f\u308c\u305f\u3053\u3068\u3092\u793a\u3059\u3002<br>\u30ea\u30e2\u30fc\u30c8\u30ea\u30dd\u306emain\u30d6\u30e9\u30f3\u30c1\u306e\u5148\u7aef\u304c\u30b3\u30df\u30c3\u30c8\u5730\u70b9A1\u2192A2\u306b\u306a\u308b\u3002<br>\u6b21\u306b\u3001<br>\u30ed\u30fc\u30ab\u30eb\u30ea\u30dd\u306emain\u30d6\u30e9\u30f3\u30c1\u306e\u5148\u7aef=\u30ea\u30e2\u30fc\u30c8\u30ea\u30dd\u306emain\u30d6\u30e9\u30f3\u30c1\u30b3\u30df\u30c3\u30c8\u5730\u70b9A1<br>\u304b\u3089\u300cgit pull\u300d\u3059\u308b\u3068\u3001<br>\u30ed\u30fc\u30ab\u30eb\u30ea\u30dd\u306emain\u30d6\u30e9\u30f3\u30c1\u306e\u5148\u7aef=\u30ea\u30e2\u30fc\u30c8\u30ea\u30dd\u306emain\u30d6\u30e9\u30f3\u30c1\u30b3\u30df\u30c3\u30c8\u5730\u70b9A2\u306b\u306a\u308b\u3002<br>\u3053\u306e\u3068\u304d\u300cFast-forward\u300d\u8868\u793a\u304c\u51fa\u308b\u3002<br><br>\u5c65\u6b74\u304c\u4e00\u76f4\u7dda\u306b\u9032\u3080\u305f\u3081\u3001&#8221;Fast-forward&#8221;\u3068\u547c\u3070\u308c\u3066\u3044\u308b\u3002<\/p>\n\n\n\n<!--more-->\n\n\n\n<br>\n<script async=\"\" src=\"https:\/\/pagead2.googlesyndication.com\/pagead\/js\/adsbygoogle.js?client=ca-pub-3461056110605997\" crossorigin=\"anonymous\"><\/script>\n<ins class=\"adsbygoogle\" style=\"display:block; text-align:center;\" data-ad-layout=\"in-article\" data-ad-format=\"fluid\" data-ad-client=\"ca-pub-3461056110605997\" data-ad-slot=\"3137443461\"><\/ins>\n<script>\n     (adsbygoogle = window.adsbygoogle || []).push({});\n<\/script>\n<br>\n\n\n\n<pre><code>\n\u3007\u3007\u3007@B-7-PC MINGW64 ~\/git-practice (main)\n$ git pull origin main\nFrom github.com:\u25b3\u25b3\u25b3\/git-practice\n * branch            main       -&gt; FETCH_HEAD\nUpdating 8b30521..2316fc2\nFast-forward\n README.md | 3 ++-\n 1 file changed, 2 insertions(+), 1 deletion(-)\n\n$ git log\ncommit 2316fc21dc0dfafe813770788a3599d19a9cb28f (HEAD -&gt; main, origin\/main, origin\/HEAD)\nAuthor: \u25b3\u25b3\u25b3 &lt;136049925+\u25b3\u25b3\u25b3@users.noreply.github.com&gt;\nDate:   Thu Jun 29 11:18:02 2023 +0900\n\n    Update README.md\n\n    change from github\n\n<\/code><\/pre>\n\n\n\n<p>git pull\u3057\u305f\u3068\u304d\u306bFast-forward\u304c\u51fa\u308b\u5834\u5408\u306f\u3001git log\u3067\u306f\u300cFast-forward\u300d\u3068\u306f\u51fa\u306a\u3044\u3093\u3060\u306a\u3002<br>Fast-forward\u3067\u306f\u306a\u3044\u30b1\u30fc\u30b9\u306f\u300cAutomatic merge\u300dor \u300cCoflict\u300d\u306b\u306a\u308b\u3002<br>\u5404\u30b3\u30df\u30c3\u30c8\u304c\u7570\u306a\u308b\u7b87\u6240\u3092\u5909\u66f4\u3057\u3066\u3044\u308b\u5834\u5408\u3001\u81ea\u52d5\u3067Merge\u3057\u3066\u304f\u308c\u308b(Automatic merge)<br>Automatic merge\u306f\u300cmerge branch\u300d\u3067\u8868\u793a\u3055\u308c\u308b\u3002<br>\u5404\u30b3\u30df\u30c3\u30c8\u304c\u540c\u3058\u7b87\u6240\u3092\u5909\u66f4\u3057\u3066\u3044\u308b\u5834\u5408\u3001Merge conflict\u3092\u8d77\u3053\u3059(\u81ea\u5206\u3067\u5bfe\u51e6\u3059\u308b\u5fc5\u8981\u304c\u3042\u308b)<\/p>\n\n\n\n<script type=\"text\/javascript\">\njQuery(function($){\n$(\".jp-video\").hide();\n});\n<\/script>\n","protected":false},"excerpt":{"rendered":"<p>\u300cgit pull\u300d\u3092\u3057\u305f\u3068\u304d\u306b\u3001\u300cFast-forward\u300d\u8868\u793a\u304c\u51fa\u305f\u3002\u300cgit pull\u300d\u306f\u30de\u30fc\u30b8\u306e\u4e00\u7a2e\u3067\u3042\u308b\u3002pull = fetch + merge\u30c7\u30fc\u30bf\u3092\u6301\u3063\u3066\u304f\u308b\u306e\u304cfetch\u3001\u30c7\u30fc\u30bf\u3092\u9001\u308b\u306e\u304cpush\u3067\u3042\u308b [&hellip;]<\/p>\n","protected":false},"author":1,"featured_media":0,"comment_status":"open","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"_jetpack_memberships_contains_paid_content":false,"footnotes":""},"categories":[12],"tags":[],"class_list":["post-3603","post","type-post","status-publish","format-standard","hentry","category-it"],"jetpack_featured_media_url":"","jetpack-related-posts":[],"jetpack_sharing_enabled":true,"_links":{"self":[{"href":"https:\/\/attacktube.com\/index.php?rest_route=\/wp\/v2\/posts\/3603","targetHints":{"allow":["GET"]}}],"collection":[{"href":"https:\/\/attacktube.com\/index.php?rest_route=\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/attacktube.com\/index.php?rest_route=\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/attacktube.com\/index.php?rest_route=\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"https:\/\/attacktube.com\/index.php?rest_route=%2Fwp%2Fv2%2Fcomments&post=3603"}],"version-history":[{"count":13,"href":"https:\/\/attacktube.com\/index.php?rest_route=\/wp\/v2\/posts\/3603\/revisions"}],"predecessor-version":[{"id":3638,"href":"https:\/\/attacktube.com\/index.php?rest_route=\/wp\/v2\/posts\/3603\/revisions\/3638"}],"wp:attachment":[{"href":"https:\/\/attacktube.com\/index.php?rest_route=%2Fwp%2Fv2%2Fmedia&parent=3603"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/attacktube.com\/index.php?rest_route=%2Fwp%2Fv2%2Fcategories&post=3603"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/attacktube.com\/index.php?rest_route=%2Fwp%2Fv2%2Ftags&post=3603"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}