{"id":4602,"date":"2021-09-22T16:18:24","date_gmt":"2021-09-22T07:18:24","guid":{"rendered":"https:\/\/www.chihayafuru.jp\/tech\/?p=4602"},"modified":"2024-09-20T09:56:28","modified_gmt":"2024-09-20T00:56:28","slug":"git-%e3%83%aa%e3%83%99%e3%83%bc%e3%82%b9%e3%81%ae%e3%81%a8%e3%81%8d%e3%81%ab%e3%83%9e%e3%83%bc%e3%82%b8%e3%82%b3%e3%83%9f%e3%83%83%e3%83%88%e3%81%8c%e6%b6%88%e3%81%88%e3%82%8b","status":"publish","type":"post","link":"https:\/\/www.chihayafuru.jp\/tech\/index.php\/archives\/4602","title":{"rendered":"[git] \u30ea\u30d9\u30fc\u30b9\u306e\u3068\u304d\u306b\u30de\u30fc\u30b8\u30b3\u30df\u30c3\u30c8\u304c\u6d88\u3048\u308b"},"content":{"rendered":"<h3>1. \u75c7\u72b6<\/h3>\n<p>git rebase \u3092\u5b9f\u884c\u3057\u305f\u3068\u304d\u306b <strong>Non Fast-Forward<\/strong> ( <code>--no-ff<\/code> ) \u306e\u30de\u30fc\u30b8\u30b3\u30df\u30c3\u30c8\u304c\u6d88\u3048\u308b\u3002\u5206\u5c90\u3084\u5408\u6d41\u306e\u306a\u3044\u4e00\u672c\u306e\u76f4\u7dda\u7684\u306a\u30b3\u30df\u30c3\u30c8\u306b\u307e\u3068\u3081\u3066\u3057\u307e\u3046\u3002<\/p>\n<p><!--more--><\/p>\n<h3>2. \u5bfe\u7b56<\/h3>\n<p><code>-r<\/code> \u307e\u305f\u306f <code>--rebase-merges<\/code> \u30aa\u30d7\u30b7\u30e7\u30f3\u3067\u5b9f\u884c\u3059\u308b\u3002<\/p>\n<pre class=\"lang:default highlight:0 decode:true \" >$ git rebase --rebase-merges main<\/pre>\n<h3>3. \u88dc\u8db3<\/h3>\n<p><code>--preserve-merges<\/code> \u30aa\u30d7\u30b7\u30e7\u30f3\u306f\u975e\u63a8\u5968(deprecated)<\/p>\n<h3>4. \u5916\u90e8\u30ea\u30f3\u30af<\/h3>\n<ul>\n<li><a href=\"https:\/\/git-scm.com\/docs\/git-rebase#Documentation\/git-rebase.txt--r\">https:\/\/git-scm.com\/docs\/git-rebase<\/a><\/li>\n<\/ul>\n<h3>5. \u5185\u90e8\u30ea\u30f3\u30af<\/h3>\n<ul>\n<li><a href=\"\/tech\/index.php\/archives\/7288\">[git] rebase<\/a><\/li>\n<\/ul>\n","protected":false},"excerpt":{"rendered":"<p>1. \u75c7\u72b6 git rebase \u3092\u5b9f\u884c\u3057\u305f\u3068\u304d\u306b Non Fast-Forward ( &#8211;no-ff ) \u306e\u30de\u30fc\u30b8\u30b3\u30df\u30c3\u30c8\u304c\u6d88\u3048\u308b\u3002\u5206\u5c90\u3084\u5408\u6d41\u306e\u306a\u3044\u4e00\u672c\u306e\u76f4\u7dda\u7684\u306a\u30b3\u30df\u30c3\u30c8\u306b\u307e\u3068\u3081\u3066\u3057\u307e\u3046\u3002<\/p>\n","protected":false},"author":1,"featured_media":0,"comment_status":"closed","ping_status":"closed","sticky":false,"template":"","format":"standard","meta":{"footnotes":""},"categories":[3],"tags":[2],"class_list":["post-4602","post","type-post","status-publish","format-standard","hentry","category-memo","tag-git"],"_links":{"self":[{"href":"https:\/\/www.chihayafuru.jp\/tech\/index.php\/wp-json\/wp\/v2\/posts\/4602","targetHints":{"allow":["GET"]}}],"collection":[{"href":"https:\/\/www.chihayafuru.jp\/tech\/index.php\/wp-json\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/www.chihayafuru.jp\/tech\/index.php\/wp-json\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/www.chihayafuru.jp\/tech\/index.php\/wp-json\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"https:\/\/www.chihayafuru.jp\/tech\/index.php\/wp-json\/wp\/v2\/comments?post=4602"}],"version-history":[{"count":14,"href":"https:\/\/www.chihayafuru.jp\/tech\/index.php\/wp-json\/wp\/v2\/posts\/4602\/revisions"}],"predecessor-version":[{"id":7294,"href":"https:\/\/www.chihayafuru.jp\/tech\/index.php\/wp-json\/wp\/v2\/posts\/4602\/revisions\/7294"}],"wp:attachment":[{"href":"https:\/\/www.chihayafuru.jp\/tech\/index.php\/wp-json\/wp\/v2\/media?parent=4602"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/www.chihayafuru.jp\/tech\/index.php\/wp-json\/wp\/v2\/categories?post=4602"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/www.chihayafuru.jp\/tech\/index.php\/wp-json\/wp\/v2\/tags?post=4602"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}