{"id":26,"date":"2014-05-16T02:34:00","date_gmt":"2014-05-15T17:34:00","guid":{"rendered":"http:\/\/the-takeo.expressweb.jp\/?p=26"},"modified":"2015-11-01T11:20:07","modified_gmt":"2015-11-01T02:20:07","slug":"git-rebase%e3%81%a7%e3%82%b3%e3%83%9f%e3%83%83%e3%83%88%e5%b1%a5%e6%ad%b4%e3%82%92%e4%bf%ae%e6%ad%a3%e3%81%99%e3%82%8b","status":"publish","type":"post","link":"http:\/\/the-takeo.com\/?p=26","title":{"rendered":"git rebase\u3067\u30b3\u30df\u30c3\u30c8\u5c65\u6b74\u3092\u4fee\u6b63\u3059\u308b"},"content":{"rendered":"

\u524d\u56de\u30e1\u30e2\u3057\u305fIssue\u304b\u3089PullRequest\u3092\u4f5c\u6210\u3059\u308b<\/a>\u3092\u30ef\u30fc\u30af\u30d5\u30ed\u30fc\u306b\u5165\u308c\u308b\u3068\u3042\u308b\u554f\u984c\u304c\u751f\u3058\u308b\u3002<\/p>\n

\u305d\u308c\u306f\u3001\u7a7a\u306e\u30b3\u30df\u30c3\u30c8\u3092\u4f5c\u6210\u3057\u3066\u3044\u308b\u305b\u3044\u3067\u3001\u305d\u306ePullRequest\u3092Master\u30d6\u30e9\u30f3\u30c1\u306b\u30de\u30fc\u30b8\u3057\u305f\u5834\u5408\u3001master\u30d6\u30e9\u30f3\u30c1\u306b\u4f59\u8a08\u306a\u7a7a\u30b3\u30df\u30c3\u30c8\u304c\u4f5c\u6210\u3055\u308c\u3066\u3057\u307e\u3046<\/b>\u3068\u3044\u3046\u70b9\u3060\u3002<\/p>\n

\u6b63\u76f4\u8a00\u3063\u3066\u3001\u50d5\u306f\u300c\u305d\u308c\u3067\u3082\u3044\u3044\u3058\u3083\u3093\u3001\u5909\u66f4\u304c\u8ffd\u3044\u306b\u304f\u304f\u306a\u308b\u308f\u3051\u3067\u3082\u306a\u3044\u3057\u300d\u3068\u3044\u3046\u8003\u3048\u3092\u3057\u3066\u3057\u307e\u3046\u306e\u3060\u304c\u3001\u4f1a\u793e\u3067\u306f\u53ef\u80fd\u306a\u9650\u308a\u30b3\u30df\u30c3\u30c8\u306f\u7dba\u9e97\u306b\u3059\u308b\u65b9\u91dd\u306a\u306e\u3067\u3001\u30b3\u30df\u30c3\u30c8\u3092\u4fee\u6b63\u3059\u308b\u65b9\u91dd\u3092\u3068\u3063\u3066\u3044\u308b\u3002
\n\u3053\u306e\u5909\u66f4\u306a\u306e\u3060\u304c\u3001vim\u304c\u4f7f\u3048\u306a\u3044\u3068\u8f9b\u3044\u3002
\n\u30cd\u30c3\u30c8\u3067\u8abf\u3079\u3066\u3082\u300cvim?\u4f7f\u3048\u3066\u5f53\u7136\u3060\u308d\u300d\u3068\u8a00\u308f\u3093\u3070\u304b\u308a\u306e\u8cc7\u6599\u3070\u304b\u308a\u3002
\n\u77e5\u3089\u306a\u3044\u306e\u304c\u60aa\u3044\u3001\u81ea\u5206\u3067\u89e3\u6c7a\u3057\u308d\u3001\u3068\u3044\u3046\u30d7\u30ed\u30b0\u30e9\u30de\u306e\u3053\u3046\u3044\u3046\u3068\u3053\u308d\u304c\u5acc\u3060\u3002
\n\uff08\u81ea\u5206\u306e\u5411\u4e0a\u5fc3\u306e\u306a\u3055\u3092\u68da\u306b\u4e0a\u3052\u308b\uff09<\/p>\n

\u3068\u308a\u3042\u3048\u305a\u3001\u4ed5\u4e8b\u3067\u4f7f\u3063\u3066\u3044\u308b\u6700\u4f4e\u9650\u306e\u30b3\u30df\u30c3\u30c8\u4fee\u6b63\u3001rebase\u306e\u4f7f\u3044\u65b9\u3092\u66f8\u3044\u3066\u3044\u304f\u3002<\/p>\n

\n

1)commit\u3092\u884c\u3044\u3001push\u3067\u304d\u308b\u72b6\u614b\u306b\u3057\u3066\u304a\u304f<\/b><\/p>\n

2)\u30ed\u30b0\u3092\u78ba\u8a8d\u3057\u3001\u3069\u306e\u30b3\u30df\u30c3\u30c8\u3092\u4fee\u6b63\u3057\u305f\u3044\u304b\u78ba\u8a8d\u3059\u308b<\/b><\/p>\n\n\n\n\n
\"\"<\/a><\/td>\n<\/tr>\n
ex)\u4eca\u56de\u306f3\u756a\u76ee\u306efix\u3068\u3044\u3046\u30b3\u30df\u30c3\u30c8\u3092\u30012\u756a\u76ee\u306ewrite\u3068\u3044\u3046\u30b3\u30df\u30c3\u30c8\u306b\u7d71\u5408\u3055\u305b\u308b\u3053\u3068\u3092\u76ee\u7684\u3068\u3057\u307e\u3059<\/span><\/td>\n<\/tr>\n<\/tbody>\n<\/table>\n

3)rebase\u30b3\u30de\u30f3\u30c9\u3092\u6253\u3061\u8fbc\u3080<\/b><\/p>\n

    \n
  • git rebase -i HEAD~(\u623b\u308b\u5206\u306e\u30b3\u30df\u30c3\u30c8\u6570)<\/li>\n
  • ex)git rebase -i HEAD~2<\/li>\n<\/ul>\n

    4)\u63a1\u7528\u3059\u308b\u4fee\u6b63(=\u6700\u65b0\u306e\u4fee\u6b63)\u306epick\u3092fixup\u306b\u66f8\u304d\u63db\u3048\u308b<\/b><\/p>\n\n\n\n\n
    \"\"<\/a><\/td>\n<\/tr>\n
    rebase\u30b3\u30de\u30f3\u30c9\u3092\u884c\u3063\u305f\u9014\u7aef\u3053\u3093\u306a\u753b\u9762\u306b\u3002
    \n\u5165\u529b\u3059\u308b\u524d\u306b\u30ad\u30fc\u30dc\u30fc\u30c9\u3067i\u3092\u62bc\u3057\u3066\u5165\u529b\u30e2\u30fc\u30c9\u306b\u3059\u308b\u3002<\/b><\/td>\n<\/tr>\n<\/tbody>\n<\/table>\n\n\n\n\n
    \"\"<\/a><\/td>\n<\/tr>\n
    \u4eca\u56de\u306ffix\u3068\u3044\u3046\u30b3\u30df\u30c3\u30c8\u3092\u63a1\u7528\u3059\u308b\u306e\u3067\u3001fix\u306e\u884c\u3092pick\u304b\u3089fixup\u306b\u5909\u66f4\u3059\u308b\u3002
    \n\u5165\u529b\u3057\u305f\u3089esc\u30ad\u30fc\u3092\u62bc\u3057\u3001\u30b3\u30de\u30f3\u30c9\u30e2\u30fc\u30c9\u306b\u623b\u308b\u3002<\/b><\/td>\n<\/tr>\n<\/tbody>\n<\/table>\n

    5)\u7de8\u96c6\u3092\u5b8c\u4e86\u3055\u305b\u308b<\/b><\/p>\n

      \n
    • \u30b3\u30de\u30f3\u30c9\u30e2\u30fc\u30c9\u3067”:wq<\/b>“\u3068\u6253\u3061\u3001Enter\u3092\u62bc\u3059<\/li>\n<\/ul>\n

      6)\u6210\u529f\u3057\u305f\u304bgit log\u3067\u78ba\u8a8d<\/b><\/p>\n\n\n\n\n
      \"\"<\/a><\/td>\n<\/tr>\n
      \u6210\u529f\u3002\u30b3\u30df\u30c3\u30c8\u304c2\u3064\u306b\u306a\u3063\u3066\u3044\u308b\u3002
      \n“create”\u30b3\u30df\u30c3\u30c8\u306e\u5185\u5bb9\u306f\u7de8\u96c6\u524d\u306e”create”\u3068”fix”\u3092\u5408\u308f\u305b\u305f\u3082\u306e\u306b\u306a\u3063\u3066\u3044\u308b\u3002
      \n\u30ea\u30cd\u30fc\u30e0\u304c\u5fc5\u8981\u306a\u5834\u5408\u306f\u5f8c\u8ff0\u53c2\u7167\u3002<\/td>\n<\/tr>\n<\/tbody>\n<\/table>\n
      <\/div>\n

      7)\u6210\u529f\u3057\u3066\u308c\u3070\u3001push\u3059\u308b\u3002\u305f\u3060\u3057\u3001\u30b3\u30df\u30c3\u30c8\u306e\u66f8\u304d\u63db\u3048\u3067\u7af6\u5408\u304c\u8d77\u3053\u308b\u306e\u3067\u3001\u5f37\u5236push\u3059\u308b<\/b><\/p>\n

        \n
      • git push origin +”\u30d6\u30e9\u30f3\u30c1\u540d”<\/li>\n<\/ul>\n
        \n

        \u50d5\u306e\u30ef\u30fc\u30af\u30d5\u30ed\u30fc\u3067\u306f6)\u306e\u5f8c\u3001\u3082\u3046\u4e00\u56derebase\u3067\u30b3\u30df\u30c3\u30c8\u540d\u306e\u4fee\u6b63\u3092\u3057\u3066\u3044\u307e\u3059\u3002
        \n\u30b3\u30df\u30c3\u30c8\u540d\u306e\u4fee\u6b63\u306f”pick”\u3092”reword”\u3068\u3057\u3066\u7de8\u96c6\u5b8c\u4e86\u3059\u308c\u3070\u30ea\u30cd\u30fc\u30e0\u753b\u9762\u304c\u958b\u304b\u308c\u307e\u3059\u3002<\/p>\n

        vim\u89e6\u3063\u305f\u3053\u3068\u306a\u304b\u3063\u305f\u3093\u3060\u3051\u3069\u30e1\u30ea\u30c3\u30c8\u304c\u5206\u304b\u3089\u306a\u3044\u3002
        \n\u3069\u3046\u3082\u3001PC\u521d\u5fc3\u8005\u3067\u3059\u3002<\/p><\/div>\n","protected":false},"excerpt":{"rendered":"

        \u524d\u56de\u30e1\u30e2\u3057\u305fIssue\u304b\u3089PullRequest\u3092\u4f5c\u6210\u3059\u308b\u3092\u30ef\u30fc\u30af\u30d5\u30ed\u30fc\u306b\u5165\u308c\u308b\u3068\u3042\u308b\u554f\u984c\u304c\u751f\u3058\u308b\u3002 \u305d\u308c\u306f\u3001\u7a7a\u306e\u30b3\u30df\u30c3\u30c8\u3092\u4f5c\u6210\u3057\u3066\u3044\u308b\u305b\u3044\u3067\u3001\u305d\u306ePullRequest\u3092Master\u30d6\u30e9\u30f3\u30c1\u306b\u30de\u30fc\u30b8\u3057\u305f\u5834\u5408\u3001maste […]<\/p>\n","protected":false},"author":1,"featured_media":0,"comment_status":"closed","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"footnotes":""},"categories":[3,4],"tags":[],"class_list":["post-26","post","type-post","status-publish","format-standard","hentry","category-git","category-programming"],"_links":{"self":[{"href":"http:\/\/the-takeo.com\/index.php?rest_route=\/wp\/v2\/posts\/26","targetHints":{"allow":["GET"]}}],"collection":[{"href":"http:\/\/the-takeo.com\/index.php?rest_route=\/wp\/v2\/posts"}],"about":[{"href":"http:\/\/the-takeo.com\/index.php?rest_route=\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"http:\/\/the-takeo.com\/index.php?rest_route=\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"http:\/\/the-takeo.com\/index.php?rest_route=%2Fwp%2Fv2%2Fcomments&post=26"}],"version-history":[{"count":4,"href":"http:\/\/the-takeo.com\/index.php?rest_route=\/wp\/v2\/posts\/26\/revisions"}],"predecessor-version":[{"id":479,"href":"http:\/\/the-takeo.com\/index.php?rest_route=\/wp\/v2\/posts\/26\/revisions\/479"}],"wp:attachment":[{"href":"http:\/\/the-takeo.com\/index.php?rest_route=%2Fwp%2Fv2%2Fmedia&parent=26"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"http:\/\/the-takeo.com\/index.php?rest_route=%2Fwp%2Fv2%2Fcategories&post=26"},{"taxonomy":"post_tag","embeddable":true,"href":"http:\/\/the-takeo.com\/index.php?rest_route=%2Fwp%2Fv2%2Ftags&post=26"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}