{"id":4648,"date":"2016-11-07T09:12:22","date_gmt":"2016-11-07T00:12:22","guid":{"rendered":"http:\/\/www.lancard.com\/blog\/?p=4648"},"modified":"2025-03-12T11:26:49","modified_gmt":"2025-03-12T02:26:49","slug":"git-rebase-and-pull-rebase","status":"publish","type":"post","link":"https:\/\/www.lancard.com\/blog\/2016\/11\/07\/git-rebase-and-pull-rebase\/","title":{"rendered":"\u4f55\u6545 git rebase \u306f\u99c4\u76ee\u3067 git pull –rebase \u306f\u3044\u3044\u306e\u304b"},"content":{"rendered":"

git pull –rebase \u306f\u4fbf\u5229\u3067\u3059\u304c\u3001rebase \u3068\u8a00\u3048\u3070 git rebase\u3001\u3053\u308c\u304c\u5272\u3068\u656c\u9060\u3055\u308c\u304c\u3061\u306a\u58f0\u3092\u805e\u304f\u306e\u3067 –rebase \u30aa\u30d7\u30b7\u30e7\u30f3\u306a\u3093\u3066\u672c\u5f53\u306b\u4f7f\u3063\u3066\u3044\u3044\u306e\u304b\u5fc3\u914d\u306b\u306a\u308b\u3053\u3068\u3082\u3042\u308b\u304b\u3068\u601d\u3044\u307e\u3059\u3002<\/p>\n

\u79c1\u3082\u666e\u6bb5\u306f\u4fbf\u5229\u306b git pull –rebase \u3057\u3066\u3044\u307e\u3059\u304c\u3001\u3075\u3068 git rebase \u306e\u89e3\u8aac\u8a18\u4e8b\u3092\u307f\u304b\u3051\u308b\u3068\u6bce\u5ea6\u4e0d\u5b89\u306b\u306a\u308a\u3053\u306e\u4e8c\u3064\u306e\u4ed5\u7d44\u307f\u3092\u8abf\u3079\u3066\u3057\u307e\u3046\u306e\u3067\u3001\u3044\u3063\u305d\u306e\u3053\u3068\u307e\u3068\u3081\u3066\u3057\u307e\u3046\u3053\u3068\u306b\u3057\u307e\u3057\u305f\u3002<\/p>\n

<\/p>\n

git rebase<\/h1>\n

\u4ee5\u4e0b\u306e\u3088\u3046\u306a\u72b6\u614b\u306e\u30ea\u30dd\u30b8\u30c8\u30ea\u304c\u3042\u3063\u305f\u3068\u3057\u307e\u3059\u3002<\/p>\n

\"git-rebase-flow-rebase1\"<\/a><\/p>\n

\u4e00\u756a\u4e0a\u306f\u30ea\u30e2\u30fc\u30c8\u306e master\u3001\u4e0b 2 \u3064\u306f\u30ed\u30fc\u30ab\u30eb\u3067 master \u3068\u4f5c\u696d\u7528 branch \u3067\u3059\u3002\u4f8b\u3048\u3070\u30ed\u30fc\u30ab\u30eb\u3067\u30d6\u30e9\u30f3\u30c1\u3092\u4f5c\u6210\u3057\u3066\u4f5c\u696d\u3057\u3001\u305d\u308c\u3092 master \u306b rebase \u3059\u308b\u524d\u306b pull \u3057\u305f\u3068\u3053\u308d\u3001\u30ea\u30e2\u30fc\u30c8\u306e master \u306b\u66f4\u65b0\u304c\u3042\u3063\u305f\u5834\u5408\u7b49\u3067\u3059\u306d\u3002<\/p>\n

\u3053\u306e\u72b6\u614b\u3067 master \u30d6\u30e9\u30f3\u30c1\u304b\u3089 rebase-branch \u306b\u5bfe\u3057 rebase \u3092\u884c\u3063\u3066\u3057\u307e\u3046\u3068\u4ee5\u4e0b\u306e\u3088\u3046\u306a\u72b6\u614b\u306b\u306a\u308a\u307e\u3059\u3002<\/p>\n

\"git-rebase-flow-rebase2\"<\/a><\/p>\n

\u30d6\u30e9\u30f3\u30c1\u3067\u306e\u30b3\u30df\u30c3\u30c8\u304c\u30ea\u30e2\u30fc\u30c8\u304b\u3089\u53d6\u5f97\u3057\u305f\u30b3\u30df\u30c3\u30c8\u3088\u308a\u624b\u524d\u306b\u633f\u5165\u3055\u308c\u308b\u70ba\u3001\u30ea\u30e2\u30fc\u30c8\u306b\u65e2\u306b\u3042\u308b\u30b3\u30df\u30c3\u30c8\u306e\u30cf\u30c3\u30b7\u30e5\u304c\u5909\u308f\u3063\u3066\u3057\u307e\u3044\u307e\u3059\u3002\u30ed\u30fc\u30ab\u30eb\u3068\u30ea\u30e2\u30fc\u30c8\u304c\u4e00\u81f4\u3057\u306a\u3044\u70ba push \u51fa\u6765\u306a\u3044\u306e\u3067\u3059\u304c\u3001\u3053\u3053\u3067\u3088\u304f\u5206\u304b\u3089\u305a\u66d6\u6627\u306b git push -f \u3092\u3084\u308b\u3068\u672b\u4ee3\u307e\u3067\u6068\u307e\u308c\u308b\u3053\u3068\u3068\u306a\u308a\u307e\u3059\u3002<\/p>\n

\u3053\u308c\u304c\u4e00\u822c\u7684\u306b git rebase \u304c\u656c\u9060\u3055\u308c\u308b\u7406\u7531\u3067\u3057\u3087\u3046\u3002<\/p>\n

git pull –rebase<\/h1>\n

\u3067\u306f git pull –rebase \u3068\u306f\u4e00\u4f53\u4f55\u306a\u306e\u304b\u3002\u4ee5\u4e0b\u306e\u3088\u3046\u306a\u72b6\u6cc1\u3092\u8003\u3048\u307e\u3059\u3002<\/p>\n

\"git-rebase-flow-pull-rebase1\"<\/a><\/p>\n

\u767b\u5834\u4eba\u7269\u306f 2 \u4eba\u3001\u30ea\u30e2\u30fc\u30c8\u306e master \u30d6\u30e9\u30f3\u30c1\u3068\u30ed\u30fc\u30ab\u30eb\u306e master \u30d6\u30e9\u30f3\u30c1\u3067\u3059\u3002\u30ed\u30fc\u30ab\u30eb master \u306b\u30b3\u30df\u30c3\u30c8\u304c\u3042\u308a\u307e\u3059\u304c\u3001\u30ea\u30e2\u30fc\u30c8 master \u306b\u305d\u306e\u624b\u524d\u306b\u53cd\u6620\u3055\u308c\u308b\u30b3\u30df\u30c3\u30c8\u304c\u3042\u308b\u5834\u5408\u3067\u3059\u3002<\/p>\n

\"git-rebase-flow-pull-rebase2\"<\/a><\/p>\n

\u305d\u306e\u72b6\u614b\u304b\u3089 git pull –rebase \u3059\u308b\u3068\u3053\u306e\u3088\u3046\u306b\u306a\u308a\u307e\u3059\u3002\u30ea\u30e2\u30fc\u30c8\u306e\u66f4\u65b0\u304c\u30ed\u30fc\u30ab\u30eb\u306e\u30b3\u30df\u30c3\u30c8\u306e\u624b\u524d\u306b\u53cd\u6620\u3055\u308c\u3001\u30ed\u30fc\u30ab\u30eb\u306e\u30b3\u30df\u30c3\u30c8\u306e\u30cf\u30c3\u30b7\u30e5\u304c\u5909\u308f\u3063\u3066\u3057\u307e\u3044\u307e\u3057\u305f\u3002<\/p>\n

\"git-rebase-flow-pull-rebase3\"<\/a><\/p>\n

\u3057\u304b\u3057\u30cf\u30c3\u30b7\u30e5\u304c\u5909\u308f\u3063\u305f\u30b3\u30df\u30c3\u30c8\u306f\u307e\u3060\u30ea\u30e2\u30fc\u30c8\u306b\u5b58\u5728\u3057\u3066\u3044\u307e\u305b\u3093\u3002\u306a\u306e\u3067\u3053\u3053\u3067 push \u3057\u3066\u3082\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u306f\u767a\u751f\u305b\u305a\u3001\u554f\u984c\u306b\u306a\u3089\u306a\u3044\u3068\u3044\u3046\u308f\u3051\u3067\u3059\u3002<\/p>\n

\u3053\u3053\u3067 –rebase \u30aa\u30d7\u30b7\u30e7\u30f3\u306e\u4f55\u304c\u4fbf\u5229\u304b\u3068\u3044\u3046\u3068\u3001\u30de\u30fc\u30b8\u30b3\u30df\u30c3\u30c8\u304c\u767a\u751f\u3057\u306a\u3044\u3053\u3068\u3067\u3059\u3002pull \u3057\u3066\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u3057\u306a\u3044\u5834\u5408\u3068\u3044\u3046\u306e\u306f\u7d50\u69cb\u591a\u3044\u3067\u3059\u304c\u3001\u901a\u5e38\u306f\u305d\u306e\u969b\u306b\u3082\u30de\u30fc\u30b8\u30b3\u30df\u30c3\u30c8\u306f\u767a\u751f\u3057\u3066\u3057\u307e\u3044\u307e\u3059\uff08\u30ed\u30fc\u30ab\u30eb\u3067\u306e\u30b3\u30df\u30c3\u30c8\u304c\u7121\u3044\u7b49\u3067 fast forward \u30de\u30fc\u30b8\u306b\u306a\u308b\u5834\u5408\u3092\u9664\u304f\uff09\u3002\u8907\u6570\u4eba\u304c\u958b\u767a\u3059\u308b\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u3067\u3001\u5404\u500b\u4eba\u306e\u30ed\u30fc\u30ab\u30eb\u30ea\u30dd\u30b8\u30c8\u30ea\u306e pull \u72b6\u6cc1\u3092\u6b8b\u3057\u305f\u30de\u30fc\u30b8\u30b3\u30df\u30c3\u30c8\u306f\u5927\u534a\u306e\u5834\u5408\u4e0d\u8981\u3067\u3057\u3087\u3046\u3002<\/p>\n

\u88dc\u8db3<\/h1>\n

git pull –rebase \u304c\u5371\u967a\u306a\u30b1\u30fc\u30b9\uff08\u591a\u5206\u5c11\u306a\u3044\uff09<\/h2>\n

\u3053\u3046\u3044\u3046\u3053\u3068\u3092\u66f8\u304f\u3068\u7d50\u5c40\u3088\u304f\u5206\u304b\u3089\u306a\u304f\u306a\u308b\u306e\u3067\u306f\u2026\u3068\u601d\u3044\u3064\u3064\u3001\u7c21\u6f54\u306b\u3002\u30ea\u30e2\u30fc\u30c8\u30ea\u30dd\u30b8\u30c8\u30ea\u3092\u8907\u6570\u6301\u3064\u30ea\u30dd\u30b8\u30c8\u30ea\u3067\u306f\u6ce8\u610f\u304c\u5fc5\u8981\u3067\u3059\u3002\u4ed5\u7d44\u307f\u306f git rebase \u306e\u9805\u306e\u30ed\u30fc\u30ab\u30eb\u30ea\u30dd\u30b8\u30c8\u30ea\u3092\u30ea\u30e2\u30fc\u30c8\u30ea\u30dd\u30b8\u30c8\u30ea\u306b\u7f6e\u304d\u66ff\u3048\u3066\u8003\u3048\u308b\u3068\u5206\u304b\u308a\u6613\u3044\u3067\u3059\u3002\u767b\u5834\u4eba\u7269\u304c 3 \u4eba\u4ee5\u4e0a\u306b\u306a\u308b\u3068\u5371\u967a\u3067\u3059\u306d\u3002<\/p>\n

\u4f46\u3057\u3053\u306e\u5834\u5408\u3082 push \u3057\u3088\u3046\u3068\u3059\u308b\u3068\u30ea\u30b8\u30a7\u30af\u30c8\u3055\u308c\u308b\u306e\u3067\u3001push -f \u3055\u3048\u3057\u306a\u3051\u308c\u3070\u3068\u306b\u304b\u304f\u5b89\u5fc3\u3068\u8003\u3048\u308b\u3053\u3068\u3082\u51fa\u6765\u307e\u3059\u3002<\/p>\n

git pull –rebase \u304c\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u3057\u305f\u5834\u5408<\/h2>\n

\u3053\u3046\u3044\u3063\u305f\u5834\u5408\u306f git rebase –abort \u53c8\u306f git reset –hard HEAD \u3057\u3066\u3001\u901a\u5e38\u306e git pull \u3092\u884c\u3044\u30de\u30fc\u30b8\u30b3\u30df\u30c3\u30c8\u3092\u4f5c\u6210\u3057\u3066\u3082\u3044\u3044\u304b\u3082\u3057\u308c\u307e\u305b\u3093\u3002\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u3057\u305f\u5834\u5408\u306e rebase \u64cd\u4f5c\u304c\u3084\u3084\u3053\u3057\u3044\u3068\u3044\u3046\u306e\u3082\u3042\u308a\u307e\u3059\u304c\u3001\u300c\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u3092\u3069\u306e\u3088\u3046\u306b\u89e3\u6d88\u3057\u305f\u304b\u3092\u660e\u78ba\u306b\u6b8b\u3059\u300d\u3068\u3044\u3046\u610f\u5473\u3067\u30de\u30fc\u30b8\u30b3\u30df\u30c3\u30c8\u3092\u4f5c\u6210\u3059\u308b\u610f\u7fa9\u304c\u3042\u308b\u70ba\u3067\u3059\u3002<\/p>\n

\u4f46\u3057 pull \u3057\u305f\u5834\u5408\u306e\u7a7a\u306e\u30de\u30fc\u30b8\u30b3\u30df\u30c3\u30c8\u304c\u30ea\u30dd\u30b8\u30c8\u30ea\u306b\u5927\u91cf\u306b\u542b\u307e\u308c\u3066\u3044\u308b\u5834\u5408\u3001\u3053\u306e\u610f\u5473\u306e\u3042\u308b\u30de\u30fc\u30b8\u30b3\u30df\u30c3\u30c8\u304c\u57cb\u3082\u308c\u3066\u3057\u307e\u3044\u307e\u3059\u3002git pull –rebase \u904b\u7528\u3092\u5fb9\u5e95\u3059\u308b\u304b\u3001\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u89e3\u6d88\u306e\u30de\u30fc\u30b8\u30b3\u30df\u30c3\u30c8\u306f\u30b3\u30df\u30c3\u30c8\u30e1\u30c3\u30bb\u30fc\u30b8\u3092\u660e\u78ba\u306b\u8a18\u8f09\u3059\u308b\u7b49\u306e\u5de5\u592b\u3092\u3057\u307e\u3057\u3087\u3046\u3002<\/p>\n

\n\"Facebook\"<\/a>\"twitter\"<\/a>\"linkedin\"<\/a>\"tumblr\"<\/a>\"mail\"<\/a>","protected":false},"excerpt":{"rendered":"

git pull –rebase \u306f\u4fbf\u5229\u3067\u3059\u304c\u3001rebase \u3068\u8a00\u3048\u3070 git rebase\u3001\u3053\u308c\u304c\u5272\u3068\u656c\u9060\u3055\u308c\u304c\u3061\u306a\u58f0\u3092\u805e\u304f\u306e\u3067 –rebase \u30aa\u30d7\u30b7\u30e7\u30f3\u306a\u3093\u3066\u672c\u5f53\u306b\u4f7f\u3063\u3066\u3044\u3044\u306e\u304b\u5fc3\u914d\u306b\u306a\u308b\u3053 […]<\/p>\n","protected":false},"author":27,"featured_media":0,"comment_status":"closed","ping_status":"closed","sticky":false,"template":"","format":"standard","meta":{"footnotes":""},"categories":[160],"tags":[],"class_list":["post-4648","post","type-post","status-publish","format-standard","hentry","category-git"],"_links":{"self":[{"href":"https:\/\/www.lancard.com\/blog\/wp-json\/wp\/v2\/posts\/4648","targetHints":{"allow":["GET"]}}],"collection":[{"href":"https:\/\/www.lancard.com\/blog\/wp-json\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/www.lancard.com\/blog\/wp-json\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/www.lancard.com\/blog\/wp-json\/wp\/v2\/users\/27"}],"replies":[{"embeddable":true,"href":"https:\/\/www.lancard.com\/blog\/wp-json\/wp\/v2\/comments?post=4648"}],"version-history":[{"count":15,"href":"https:\/\/www.lancard.com\/blog\/wp-json\/wp\/v2\/posts\/4648\/revisions"}],"predecessor-version":[{"id":4671,"href":"https:\/\/www.lancard.com\/blog\/wp-json\/wp\/v2\/posts\/4648\/revisions\/4671"}],"wp:attachment":[{"href":"https:\/\/www.lancard.com\/blog\/wp-json\/wp\/v2\/media?parent=4648"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/www.lancard.com\/blog\/wp-json\/wp\/v2\/categories?post=4648"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/www.lancard.com\/blog\/wp-json\/wp\/v2\/tags?post=4648"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}