{"id":2563,"date":"2014-03-28T16:11:14","date_gmt":"2014-03-28T07:11:14","guid":{"rendered":"http:\/\/aatljapan.wpengine.com\/?p=2563"},"modified":"2014-03-28T16:13:12","modified_gmt":"2014-03-28T07:13:12","slug":"alternatives-to-git-submodule-git-subtree","status":"publish","type":"post","link":"https:\/\/www.atlassian.com\/ja\/blog\/alternatives-to-git-submodule-git-subtree","title":{"rendered":"Git Submodule \u306e\u4ee3\u66ff: Git Subtree"},"content":{"rendered":"<div class=\"postcontent\">\n<p>\u30a4\u30f3\u30bf\u30fc\u30cd\u30c3\u30c8\u306b\u306f\u3001Git submodule \u3092<a href=\"http:\/\/codingkilledthecat.wordpress.com\/2012\/04\/28\/why-your-company-shouldnt-use-git-submodules\/\">\u4f7f\u3063\u3066\u306f<\/a> <a href=\"http:\/\/ayende.com\/blog\/4746\/the-problem-with-git-submodules\">\u3044\u3051\u306a\u3044<\/a> <a href=\"http:\/\/somethingsinistral.net\/blog\/git-submodules-are-probably-not-the-answer\/\">\u3068\u3044\u3046\u8a18\u4e8b<\/a>\u304c\u98db\u3073\u4ea4\u3063\u3066\u3044\u307e\u3059\u3002\u79c1\u306f\u3053\u308c\u3089\u306e\u8a18\u4e8b\u304c\u8a00\u3046\u307b\u3069\u3072\u3069\u3044\u3082\u306e\u3068\u306f\u601d\u3063\u3066\u3044\u307e\u305b\u3093\u304c\u3001\u305d\u3046\u3044\u3063\u305f\u4e3b\u5f35\u304c\u5927\u65b9\u6b63\u3057\u3044\u3053\u3068\u306f\u8a8d\u3081\u307e\u3059\u3002<a href=\"http:\/\/aatljapan.wpengine.com\/2013\/07\/git-submodules-workflows-tips\/\">\u4ee5\u524d\u306e\u6295\u7a3f<\/a>\u3067\u3082\u8aac\u660e\u3057\u307e\u3057\u305f\u304c\u3001<span class=\"text codecolorer\">submodule<\/span> \u306f\u5229\u7528\u4fa1\u5024\u306e\u3042\u308b\u30e6\u30fc\u30b9\u30b1\u30fc\u30b9\u306f\u5c11\u306a\u304f\u3001\u9006\u306b\u3044\u304f\u3064\u3082\u306e\u6b20\u70b9\u304c\u3042\u308a\u307e\u3059\u3002<\/p>\n<p>\u3067\u306f\u3001\u3053\u308c\u306b\u4ee3\u308f\u308b\u3082\u306e\u306f\u3042\u308b\u306e\u3067\u3057\u3087\u3046\u304b\uff1f\u3000\u7b54\u3048\u306f\u300c\u3042\u308b\u300d\u3067\u3059\u3002Git \u306e\u5229\u7528\u306f\u7d9a\u3051\u3064\u3064\u3001\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306b\u304a\u3051\u308b\u30bd\u30d5\u30c8\u30a6\u30a7\u30a2\u306e\u4f9d\u5b58\u95a2\u4fc2\u3092\u8ffd\u8de1\u3059\u308b\u3053\u3068\u304c\u3067\u304d\u308b\u30c4\u30fc\u30eb\u304c (\u5c11\u306a\u304f\u3068\u3082) \u4e8c\u3064\u3042\u308a\u307e\u3059 :<\/p>\n<ul>\n<li><a href=\"https:\/\/github.com\/git\/git\/blob\/master\/contrib\/subtree\/git-subtree.txt\">git subtree<\/a><\/li>\n<li><a href=\"https:\/\/code.google.com\/p\/git-repo\/\">google repo<\/a><\/li>\n<\/ul>\n<p>\u3053\u306e\u8a18\u4e8b\u3067\u306f\u3001<span class=\"text codecolorer\">git subtree<\/span> \u306b\u6ce8\u76ee\u3057\u3001\u5b8c\u5168\u3068\u307e\u3067\u306f\u3044\u3048\u306a\u3044\u3082\u306e\u306e\u305d\u308c\u304c <span class=\"text codecolorer\">git submodule<\/span> \u306e\u554f\u984c\u3092\u89e3\u6c7a\u3059\u308b\u3082\u306e\u3067\u3042\u308b\u3053\u3068\u3092\u8aac\u660e\u3057\u3088\u3046\u3068\u601d\u3044\u307e\u3059\u3002<\/p>\n<p>\u5b9f\u4f8b\u3068\u3057\u3066\u3044\u3064\u3082\u306e\u79c1\u306e\u30e6\u30fc\u30b9\u30b1\u30fc\u30b9\u3092\u53d6\u308a\u4e0a\u3052\u307e\u3059\u3002<a href=\"https:\/\/bitbucket.org\/durdn\/cfg\">\u81ea\u5206\u306e dotfiles<\/a> \u306b\u304a\u3044\u3066\u4f7f\u7528\u3059\u308b vim \u30d7\u30e9\u30b0\u30a4\u30f3\u3092\u4fdd\u5b58\u3057\u3001\u304b\u3064\u5e38\u306b\u6700\u65b0\u306e\u3082\u306e\u306b\u66f4\u65b0\u3059\u308b\u305f\u3081\u306b\u79c1\u304c\u3068\u3063\u3066\u3044\u308b\u65b9\u6cd5\u3092\u8aac\u660e\u3057\u307e\u3057\u3087\u3046\u3002<\/p>\n<h2>submodule \u3067\u306f\u306a\u304f subtree \u3092\u4f7f\u3046\u7406\u7531<\/h2>\n<p> <span class=\"text codecolorer\">subtree<\/span> \u306e\u65b9\u304c\u4f7f\u3044\u3084\u3059\u3044\u3068\u8ab0\u3082\u304c\u601d\u3046\u7406\u7531\u304c\u3044\u304f\u3064\u304b\u3042\u308a\u307e\u3059:<\/p>\n<ul>\n<li>\u30ef\u30fc\u30af\u30d5\u30ed\u30fc\u304c\u30b7\u30f3\u30d7\u30eb\u3067\u3042\u308a\u3001\u7ba1\u7406\u304c\u5bb9\u6613\u3067\u3042\u308b\u3002<\/li>\n<li> <span class=\"text codecolorer\">git<\/span> \u306e\u53e4\u3044\u30d0\u30fc\u30b8\u30e7\u30f3\u3082\u30b5\u30dd\u30fc\u30c8\u3057\u3066\u3044\u308b (<span class=\"text codecolorer\">v1.5.2<\/span> \u3088\u308a\u53e4\u3044\u30d0\u30fc\u30b8\u30e7\u30f3\u306b\u3082\u5bfe\u5fdc\u3057\u3066\u3044\u308b)\u3002<\/li>\n<li>\u89aa\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u3092 <span class=\"text codecolorer\">clone<\/span> \u3057\u305f\u76f4\u5f8c\u304b\u3089\u30b5\u30d6\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306e\u30b3\u30fc\u30c9\u304c\u5229\u7528\u53ef\u80fd\u3067\u3042\u308b\u3002<\/li>\n<li><span class=\"text codecolorer\">subtree<\/span> \u306e\u5834\u5408\u3001\u4f9d\u5b58\u95a2\u4fc2\u3092\u7ba1\u7406\u3059\u308b\u305f\u3081\u306b <span class=\"text codecolorer\">subtree<\/span> \u3092\u5229\u7528\u3057\u3066\u3044\u308b\u3053\u3068\u3092\u305d\u306e\u30ea\u30dd\u30b8\u30c8\u30ea\u306e\u30e6\u30fc\u30b6\u30fc\u304c\u95a2\u77e5\u3059\u308b\u5fc5\u8981\u306f\u306a\u304f\u3001\u30e6\u30fc\u30b6\u30fc\u306b\u4f59\u8a08\u306a\u30bf\u30b9\u30af\u3092\u767a\u751f\u3055\u305b\u306a\u3044\u3002<\/li>\n<li> <span class=\"text codecolorer\">submodules<\/span> \u306e\u5834\u5408\u3068\u7570\u306a\u308a\u3001<span class=\"text codecolorer\">subtree<\/span> \u3067\u306f\u30e1\u30bf\u30c7\u30fc\u30bf\u30d5\u30a1\u30a4\u30eb (\u5373\u3061\u3001<span class=\"text codecolorer\">.gitmodule<\/span>) \u3092\u65b0\u306b\u4f5c\u6210\u3059\u308b\u3053\u3068\u306f\u306a\u3044\u3002<\/li>\n<li>\u4f9d\u5b58\u95a2\u4fc2\u306b\u3042\u308b\u30e2\u30b8\u30e5\u30fc\u30eb\u306e\u5185\u5bb9\u3092\u5909\u66f4\u3059\u308b\u5834\u5408\u3067\u3082\u3001\u305d\u306e\u30ea\u30dd\u30b8\u30c8\u30ea\u306e\u30b3\u30d4\u30fc\u3092\u5225\u306b\u6301\u3064\u5fc5\u8981\u304c\u306a\u3044\u3002<\/li>\n<\/ul>\n<p>\u3053\u308c\u306b\u306f\u6b21\u306e\u3088\u3046\u306a\u6b20\u70b9\u3082\u3042\u308b\u304c\u3001\u305d\u308c\u3089\u306f\u53d7\u3051\u5165\u308c\u53ef\u80fd\u3060\u3068\u601d\u3044\u307e\u3059:<\/p>\n<ul>\n<li>\u5229\u7528\u8005\u306b\u306f\u3001\u65b0\u305f\u306a\u30de\u30fc\u30b8\u6226\u7565 (\u5373\u3061\u3001<span class=\"text codecolorer\">subtree<\/span>) \u306b\u95a2\u3059\u308b\u77e5\u8b58\u304c\u5fc5\u8981\u3067\u3042\u308b\u3002 <\/li>\n<li>\u30b5\u30d6\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306e <span class=\"text codecolorer\">upstream<\/span> \u306b\u30b3\u30f3\u30c8\u30ea\u30d3\u30e5\u30fc\u30b7\u30e7\u30f3\u3092\u623b\u3059\u624b\u9806\u306f\u3084\u3084\u8907\u96d1\u306b\u306a\u308b\u3002<\/li>\n<li>\u30b3\u30df\u30c3\u30c8\u306e\u969b\u306b\u89aa\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u3068\u30b5\u30d6\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306e\u30b3\u30fc\u30c9\u306e\u5165\u308a\u6df7\u3058\u308a\u3092\u9632\u6b62\u3059\u308b\u8cac\u4efb\u306f\u81ea\u5206\u81ea\u8eab\u306b\u3042\u308b\u3002<\/li>\n<\/ul>\n<h2>git subtree \u306e\u4f7f\u7528\u65b9\u6cd5<\/h2>\n<p><span class=\"text codecolorer\">git subtree<\/span> \u306f\u30012012\u5e745\u6708\u4ee5\u964d\u306b\u30ea\u30ea\u30fc\u30b9\u3055\u308c\u305f <span class=\"text codecolorer\">git<\/span> (<span class=\"text codecolorer\">1.7.11<\/span> \u4ee5\u964d) \u306b\u304a\u3044\u3066\u5229\u7528\u53ef\u80fd\u3067\u3059\u3002OSX \u4e0a\u3067 <a href=\"http:\/\/mxcl.github.io\/homebrew\/\">homebrew<\/a> \u3092\u4f7f\u7528\u3057\u3066\u30a4\u30f3\u30b9\u30c8\u30fc\u30eb\u3057\u305f\u5834\u5408\u306f subtree \u3082\u9069\u5207\u306b\u7d44\u307f\u8fbc\u307e\u308c\u3066\u3044\u308b\u304c\u3001\u30d7\u30e9\u30c3\u30c8\u30d5\u30a9\u30fc\u30e0\u306b\u3088\u3063\u3066\u306f<a href=\"https:\/\/github.com\/git\/git\/blob\/master\/contrib\/subtree\/INSTALL\">\u30a4\u30f3\u30b9\u30c8\u30fc\u30eb\u30ac\u30a4\u30c9<\/a>\u306b\u5f93\u3063\u305f\u4f5c\u696d\u304c\u5fc5\u8981\u3067\u3059\u3002<\/p>\n<p>\u5178\u578b\u7684\u306a\u4f7f\u7528\u4f8b\u3068\u3057\u3066\u3001<span class=\"text codecolorer\">git subtree<\/span> \u3092\u5229\u7528\u3057\u3066 vim \u30d7\u30e9\u30b0\u30a4\u30f3\u306e\u30c8\u30e9\u30c3\u30ad\u30f3\u30b0\u3092\u884c\u3046\u5834\u5408\u3092\u8aac\u660e\u3057\u307e\u3057\u3087\u3046\u3002<\/p>\n<h3>\u30ea\u30e2\u30fc\u30c8\u30c8\u30e9\u30c3\u30ad\u30f3\u30b0\u4e0d\u8981\u306e\u7c21\u4fbf\u306a\u65b9\u6cd5<\/h3>\n<p>\u30ef\u30f3\u30e9\u30a4\u30ca\u30fc\u3092\u4e8c\u30fb\u4e09\u884c\u30ab\u30c3\u30c8\u30fb\u30da\u30fc\u30b9\u30c8\u3059\u308b\u7a0b\u5ea6\u306e\u4f5c\u696d\u306e\u5834\u5408\u3001\u3053\u306e\u7bc0\u306e\u5185\u5bb9\u304c\u53c2\u8003\u306b\u306a\u308b\u3068\u601d\u308f\u308c\u307e\u3059\u3002<\/p>\n<p>\u6700\u521d\u306b\u3001\u6307\u5b9a\u3057\u305f <span class=\"text codecolorer\">prefix<\/span> \u30d5\u30a9\u30eb\u30c0\u306b\u304a\u3044\u3066 <span class=\"text codecolorer\">subtree<\/span> \u3092\u5b9a\u7fa9\u3057\u307e\u3059:<\/p>\n<pre>\r\n\r\n<div class=\"codecolorer-container text mac-classic\" style=\"overflow:auto;white-space:nowrap;width:600px;\"><table cellspacing=\"0\" cellpadding=\"0\"><tbody><tr><td class=\"line-numbers\"><div>1<br \/><\/div><\/td><td><div class=\"text codecolorer\">git subtree add --prefix .vim\/bundle\/tpope-vim-surround https:\/\/bitbucket.org\/vim-plugins-mirror\/vim-surround.git master --squash<\/div><\/td><\/tr><\/tbody><\/table><\/div>\r\n\r\n<\/pre>\n<p><em>(\u901a\u5e38\u306e\u6163\u884c\u3067\u306f\u30b5\u30d6\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306e\u5c65\u6b74\u306e\u3059\u3079\u3066\u3092\u89aa\u30ea\u30dd\u30b8\u30c8\u30ea\u306b\u4fdd\u5b58\u3059\u308b\u3053\u3068\u306f\u306a\u3044\u304c\u3001\u4fdd\u5b58\u3057\u305f\u3044\u5834\u5408\u306f <span class=\"text codecolorer\">\u2013squash<\/span> \u30d5\u30e9\u30b0\u3092\u524a\u9664\u3059\u308c\u3070\u3088\u3044\u3067\u3057\u3087\u3046)\u3002<\/em><\/p>\n<p>\u4e0a\u306e\u30b3\u30de\u30f3\u30c9\u3092\u5b9f\u884c\u3059\u308b\u3068\u6b21\u306e\u3088\u3046\u306a\u51fa\u529b\u304c\u5f97\u3089\u308c\u307e\u3059:<\/p>\n<pre>\r\n\r\n<div class=\"codecolorer-container text mac-classic\" style=\"overflow:auto;white-space:nowrap;width:600px;\"><table cellspacing=\"0\" cellpadding=\"0\"><tbody><tr><td class=\"line-numbers\"><div>1<br \/>2<br \/>3<br \/>4<br \/>5<br \/>6<br \/>7<br \/>8<br \/>9<br \/>10<br \/><\/div><\/td><td><div class=\"text codecolorer\">git fetch https:\/\/bitbucket.org\/vim-plugins-mirror\/vim-surround.git master<br \/>\r\nwarning: no common commits<br \/>\r\nremote: Counting objects: 338, done.<br \/>\r\nremote: Compressing objects: 100% (145\/145), done.<br \/>\r\nremote: Total 338 (delta 101), reused 323 (delta 89)<br \/>\r\nReceiving objects: 100% (338\/338), 71.46 KiB, done.<br \/>\r\nResolving deltas: 100% (101\/101), done.<br \/>\r\nFrom https:\/\/bitbucket.org\/vim-plugins-mirror\/vim-surround.git<br \/>\r\n* branch &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;master &nbsp; &nbsp; -} FETCH_HEAD<br \/>\r\nAdded dir '.vim\/bundle\/tpope-vim-surround'<\/div><\/td><\/tr><\/tbody><\/table><\/div>\r\n\r\n<\/pre>\n<p>\u898b\u308b\u3068\u5206\u304b\u308b\u3088\u3046\u306b\u3001\u3053\u3053\u3067\u306f <span class=\"text codecolorer\">vim-surround<\/span> \u306e\u5168\u5c65\u6b74\u3092\u3072\u3068\u3064\u306b\u307e\u3068\u3081\u305f <span class=\"text codecolorer\">merge commit<\/span> \u306e\u8a18\u9332\u3092\u884c\u3063\u3066\u3044\u307e\u3059:<\/p>\n<pre>\r\n\r\n<div class=\"codecolorer-container text mac-classic\" style=\"overflow:auto;white-space:nowrap;width:600px;\"><table cellspacing=\"0\" cellpadding=\"0\"><tbody><tr><td class=\"line-numbers\"><div>1<br \/>2<br \/><\/div><\/td><td><div class=\"text codecolorer\">1bda0bd [3 minutes ago] (HEAD, stree) Merge commit 'ca1f4da9f0b93346bba9a430c889a95f75dc0a83' as '.vim\/bundle\/tpope-vim-surround' [Nicola Paolucci]<br \/>\r\nca1f4da [3 minutes ago] Squashed '.vim\/bundle\/tpope-vim-surround\/' content from commit 02199ea [Nicola Paolucci]<\/div><\/td><\/tr><\/tbody><\/table><\/div>\r\n\r\n<\/pre>\n<p>\u3053\u306e\u5f8c\u3067 <span class=\"text codecolorer\">upstream<\/span> \u30ea\u30dd\u30b8\u30c8\u30ea\u304b\u3089\u30d7\u30e9\u30b0\u30a4\u30f3\u306e\u30a2\u30c3\u30d7\u30c7\u30fc\u30c8\u3092\u884c\u3046\u5834\u5408\u306f\u3001\u5358\u306b <span class=\"text codecolorer\">subtree pull<\/span> \u3092\u884c\u3048\u3070\u3088\u3044\u3067\u3057\u3087\u3046:<\/p>\n<pre>\r\n\r\n<div class=\"codecolorer-container text mac-classic\" style=\"overflow:auto;white-space:nowrap;width:600px;\"><table cellspacing=\"0\" cellpadding=\"0\"><tbody><tr><td class=\"line-numbers\"><div>1<br \/><\/div><\/td><td><div class=\"text codecolorer\">git subtree pull --prefix .vim\/bundle\/tpope-vim-surround https:\/\/bitbucket.org\/vim-plugins-mirror\/vim-surround.git master --squash<\/div><\/td><\/tr><\/tbody><\/table><\/div>\r\n\r\n<\/pre>\n<p>\u3053\u306e\u65b9\u6cd5\u306f\u7c21\u4fbf\u3067\u306f\u3042\u308b\u304c\u3001\u3084\u3084\u30b3\u30de\u30f3\u30c9\u304c\u9577\u304f\u899a\u3048\u306b\u304f\u3044\u306e\u304c\u6b20\u70b9\u3067\u3059\u3002\u30b5\u30d6\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u3092\u30ea\u30e2\u30fc\u30c8\u3068\u3057\u3066\u4f5c\u6210\u3059\u308b\u3053\u3068\u306b\u3088\u308a\u3001\u30b3\u30de\u30f3\u30c9\u3092\u77ed\u304f\u3059\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u3059\u3002<\/p>\n<h3>\u30b5\u30d6\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u3092\u30ea\u30e2\u30fc\u30c8\u3068\u3057\u3066\u4f5c\u6210\u3059\u308b<\/h3>\n<p>\u30b5\u30d6\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u3092\u30ea\u30e2\u30fc\u30c8\u3068\u3057\u3066\u4f5c\u6210\u3059\u308b\u3053\u3068\u306b\u3088\u308a\u3001\u77ed\u3044\u5f62\u5f0f\u3067\u305d\u308c\u3092\u53c2\u7167\u3059\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u3059:<\/p>\n<pre>\r\n\r\n<div class=\"codecolorer-container text mac-classic\" style=\"overflow:auto;white-space:nowrap;width:600px;\"><table cellspacing=\"0\" cellpadding=\"0\"><tbody><tr><td class=\"line-numbers\"><div>1<br \/><\/div><\/td><td><div class=\"text codecolorer\">git remote add -f tpope-vim-surround https:\/\/bitbucket.org\/vim-plugins-mirror\/vim-surround.git<\/div><\/td><\/tr><\/tbody><\/table><\/div>\r\n\r\n<\/pre>\n<p>\u524d\u3068\u540c\u69d8\u306b\u3053\u3053\u3067\u30b5\u30d6\u30c4\u30ea\u30fc\u3092\u5b9a\u7fa9\u3059\u308b\u304c\u3001\u30ea\u30e2\u30fc\u30c8\u3092\u53c2\u7167\u3059\u308b\u305f\u3081\u77ed\u3044\u5f62\u5f0f\u304c\u5229\u7528\u3067\u304d\u307e\u3059:<\/p>\n<pre>\r\n\r\n<div class=\"codecolorer-container text mac-classic\" style=\"overflow:auto;white-space:nowrap;width:600px;\"><table cellspacing=\"0\" cellpadding=\"0\"><tbody><tr><td class=\"line-numbers\"><div>1<br \/><\/div><\/td><td><div class=\"text codecolorer\">git subtree add --prefix .vim\/bundle\/tpope-vim-surround tpope-vim-surround master --squash<\/div><\/td><\/tr><\/tbody><\/table><\/div>\r\n\r\n<\/pre>\n<p>\u5f8c\u306b\u30b5\u30d6\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u3092\u30a2\u30c3\u30d7\u30c7\u30fc\u30c8\u3059\u308b\u5834\u5408\u306e\u30b3\u30de\u30f3\u30c9\u306f\u6b21\u306e\u3088\u3046\u306b\u306a\u308a\u307e\u3059:<\/p>\n<pre>\r\n\r\n<div class=\"codecolorer-container text mac-classic\" style=\"overflow:auto;white-space:nowrap;width:600px;\"><table cellspacing=\"0\" cellpadding=\"0\"><tbody><tr><td class=\"line-numbers\"><div>1<br \/>2<br \/><\/div><\/td><td><div class=\"text codecolorer\">git fetch tpope-vim-surround master<br \/>\r\ngit subtree pull --prefix .vim\/bundle\/tpope-vim-surround tpope-vim-surround master --squash<\/div><\/td><\/tr><\/tbody><\/table><\/div>\r\n\r\n<\/pre>\n<h3>\u30b3\u30f3\u30c8\u30ea\u30d3\u30e5\u30fc\u30b7\u30e7\u30f3\u3092 upstream \u306b\u623b\u3059<\/h3>\n<p>\u30ed\u30fc\u30ab\u30eb\u306e\u4f5c\u696d\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u5185\u3067\u306f\u30b5\u30d6\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306e\u4fee\u6b63\u306f\u81ea\u7531\u3067\u3059\u3002<\/p>\n<p>\u30ed\u30fc\u30ab\u30eb\u306e\u30b3\u30f3\u30c8\u30ea\u30d3\u30e5\u30fc\u30b7\u30e7\u30f3\u3092 <span class=\"text codecolorer\">upstream<\/span> \u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306b\u623b\u3059\u5834\u5408\u306f\u3001\u305d\u306e\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u3092\u30d5\u30a9\u30fc\u30af\u3057\u3066\u5225\u306e\u30ea\u30e2\u30fc\u30c8\u3068\u3057\u3066\u4f5c\u6210\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059:<\/p>\n<pre>\r\n\r\n<div class=\"codecolorer-container text mac-classic\" style=\"overflow:auto;white-space:nowrap;width:600px;\"><table cellspacing=\"0\" cellpadding=\"0\"><tbody><tr><td class=\"line-numbers\"><div>1<br \/><\/div><\/td><td><div class=\"text codecolorer\">git remote add durdn-vim-surround ssh:\/\/git@bitbucket.org\/durdn\/vim-surround.git<\/div><\/td><\/tr><\/tbody><\/table><\/div>\r\n\r\n<\/pre>\n<p>\u3053\u3053\u3067\u3001\u6b21\u306e\u3088\u3046\u306b <span class=\"text codecolorer\">subtree push<\/span> \u30b3\u30de\u30f3\u30c9\u3092\u5b9f\u884c\u3059\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u3059:<\/p>\n<pre>\r\n\r\n<div class=\"codecolorer-container text mac-classic\" style=\"overflow:auto;white-space:nowrap;width:600px;\"><table cellspacing=\"0\" cellpadding=\"0\"><tbody><tr><td class=\"line-numbers\"><div>1<br \/>2<br \/>3<br \/>4<br \/>5<br \/>6<br \/>7<br \/>8<br \/>9<br \/>10<br \/><\/div><\/td><td><div class=\"text codecolorer\">git subtree push --prefix=.vim\/bundle\/tpope-vim-surround\/ durdn-vim-surround master<br \/>\r\n<br \/>\r\ngit push using: &nbsp;durdn-vim-surround master<br \/>\r\nCounting objects: 5, done.<br \/>\r\nDelta compression using up to 4 threads.<br \/>\r\nCompressing objects: 100% (3\/3), done.<br \/>\r\nWriting objects: 100% (3\/3), 308 bytes, done.<br \/>\r\nTotal 3 (delta 2), reused 0 (delta 0)<br \/>\r\nTo ssh:\/\/git@bitbucket.org\/durdn\/vim-surround.git<br \/>\r\n&nbsp; 02199ea..dcacd4b &nbsp;dcacd4b21fe51c9b5824370b3b224c440b3470cb -} master<\/div><\/td><\/tr><\/tbody><\/table><\/div>\r\n\r\n<\/pre>\n<p>\u3053\u308c\u304c\u5b8c\u4e86\u3059\u308b\u3068\u3001\u30d1\u30c3\u30b1\u30fc\u30b8\u958b\u767a\u5168\u4f53\u306e\u30e1\u30a4\u30f3\u30c6\u30ca\u30fc\u306b\u5bfe\u3057\u3066 <span class=\"text codecolorer\">pull-request<\/span> \u3092\u9001\u308b\u6e96\u5099\u304c\u6574\u3044\u307e\u3059\u3002<\/p>\n<h3>subtree \u30b3\u30de\u30f3\u30c9\u3092\u4f7f\u7528\u3057\u306a\u3044\u65b9\u6cd5<\/h3>\n<p><span class=\"text codecolorer\">git subtree<\/span> \u306f\u3001 <a href=\"https:\/\/www.kernel.org\/pub\/software\/scm\/git\/docs\/howto\/using-merge-subtree.html\">subtree \u30de\u30fc\u30b8\u6226\u7565<\/a>\u3068\u306f\u7570\u306a\u308b\u3082\u306e\u3067\u3059\u3002\u4f55\u3089\u304b\u306e\u7406\u7531\u3067 <span class=\"text codecolorer\">git subtree<\/span> \u30b3\u30de\u30f3\u30c9\u304c\u5229\u7528\u3067\u304d\u306a\u3044\u5834\u5408\u3067\u3042\u3063\u3066\u3082\u3001\u30de\u30fc\u30b8\u6226\u7565\u3092\u5229\u7528\u3059\u308b\u3053\u3068\u306f\u53ef\u80fd\u3067\u3059\u3002\u3053\u3053\u3067\u306f\u305d\u306e\u624b\u9806\u3092\u8aac\u660e\u3057\u307e\u3059:<\/p>\n<p>\u4f9d\u5b58\u95a2\u4fc2\u306b\u3042\u308b\u30d7\u30e9\u30b0\u30a4\u30f3\u3092\u901a\u5e38\u306e <a href=\"https:\/\/github.com\/git\/git\/blob\/master\/contrib\/subtree\/INSTALL\">git remote<\/a> \u3068\u3057\u3066\u4f5c\u6210\u3057\u307e\u3059:<\/p>\n<pre>\r\n\r\n<div class=\"codecolorer-container text mac-classic\" style=\"overflow:auto;white-space:nowrap;width:600px;\"><table cellspacing=\"0\" cellpadding=\"0\"><tbody><tr><td class=\"line-numbers\"><div>1<br \/><\/div><\/td><td><div class=\"text codecolorer\">git remote add -f tpope-vim-surround https:\/\/bitbucket.org\/vim-plugins-mirror\/vim-surround.git<\/div><\/td><\/tr><\/tbody><\/table><\/div>\r\n\r\n<\/pre>\n<p>\u4f9d\u5b58\u95a2\u4fc2\u306b\u3042\u308b\u30d7\u30e9\u30b0\u30a4\u30f3\u306e\u5185\u5bb9\u3092\u30ea\u30dd\u30b8\u30c8\u30ea\u306b\u8aad\u307f\u53d6\u308b\u524d\u306b\u3001\u30d7\u30e9\u30b0\u30a4\u30f3\u306e\u305d\u306e\u6642\u70b9\u307e\u3067\u306e\u5168\u5c65\u6b74\u3092\u8ffd\u8de1\u3067\u304d\u308b\u3088\u3046\u306b\u30de\u30fc\u30b8\u3092\u884c\u3063\u3066\u305d\u308c\u3092\u8a18\u9332\u3057\u3066\u304a\u304f\u3053\u3068\u304c\u91cd\u8981\u3067\u3059:<\/p>\n<pre>\r\n\r\n<div class=\"codecolorer-container text mac-classic\" style=\"overflow:auto;white-space:nowrap;width:600px;\"><table cellspacing=\"0\" cellpadding=\"0\"><tbody><tr><td class=\"line-numbers\"><div>1<br \/><\/div><\/td><td><div class=\"text codecolorer\">git merge -s ours --no-commit tpope-vim-surround\/master<\/div><\/td><\/tr><\/tbody><\/table><\/div>\r\n\r\n<\/pre>\n<p>\u3053\u308c\u306b\u3088\u308a\u6b21\u306e\u3088\u3046\u306a\u51fa\u529b\u304c\u5f97\u3089\u308c\u307e\u3059:<\/p>\n<pre>\r\n\r\n<div class=\"codecolorer-container text mac-classic\" style=\"overflow:auto;white-space:nowrap;width:600px;\"><table cellspacing=\"0\" cellpadding=\"0\"><tbody><tr><td class=\"line-numbers\"><div>1<br \/><\/div><\/td><td><div class=\"text codecolorer\">Automatic merge went well; stopped before committing as requested<\/div><\/td><\/tr><\/tbody><\/table><\/div>\r\n\r\n<\/pre>\n<p>\u3053\u3053\u3067\u30d7\u30e9\u30b0\u30a4\u30f3\u30ea\u30dd\u30b8\u30c8\u30ea\u5185\u306e\u30c4\u30ea\u30fc\u30aa\u30d6\u30b8\u30a7\u30af\u30c8\u306e\u6700\u65b0\u306e\u5185\u5bb9\u3092\u4f5c\u696d\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u306b\u8aad\u307f\u53d6\u308b\u3053\u3068\u304c\u53ef\u80fd\u306b\u306a\u308a\u3001\u305d\u308c\u3092\u30b3\u30df\u30c3\u30c8\u3059\u308b\u6e96\u5099\u304c\u6574\u3044\u307e\u3059:<\/p>\n<pre>\r\n\r\n<div class=\"codecolorer-container text mac-classic\" style=\"overflow:auto;white-space:nowrap;width:600px;\"><table cellspacing=\"0\" cellpadding=\"0\"><tbody><tr><td class=\"line-numbers\"><div>1<br \/><\/div><\/td><td><div class=\"text codecolorer\">git read-tree --prefix=.vim\/bundle\/tpope-vim-surround\/ -u tpope-vim-surround\/master<\/div><\/td><\/tr><\/tbody><\/table><\/div>\r\n\r\n<\/pre>\n<p>\u3053\u3053\u3067\u30b3\u30df\u30c3\u30c8\u3092\u884c\u3044\u307e\u3059 (\u3053\u306e\u30b3\u30df\u30c3\u30c8\u306f\u8aad\u307f\u53d6\u308b\u30c4\u30ea\u30fc\u306e\u5168\u5c65\u6b74\u3092\u4fdd\u5b58\u53ef\u80fd\u306a\u30de\u30fc\u30b8\u30b3\u30df\u30c3\u30c8\u3068\u3059\u308b\u3079\u304d\u3067\u3059):<\/p>\n<pre>\r\n\r\n<div class=\"codecolorer-container text mac-classic\" style=\"overflow:auto;white-space:nowrap;width:600px;\"><table cellspacing=\"0\" cellpadding=\"0\"><tbody><tr><td class=\"line-numbers\"><div>1<br \/>2<br \/>3<br \/><\/div><\/td><td><div class=\"text codecolorer\">git ci -m&quot;[subtree] adding tpope-vim-surround&quot;<br \/>\r\n<br \/>\r\n[stree 779b094] [subtree] adding tpope-vim-surround<\/div><\/td><\/tr><\/tbody><\/table><\/div>\r\n\r\n<\/pre>\n<p>\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306e\u30a2\u30c3\u30d7\u30c7\u30fc\u30c8\u3092\u884c\u3046\u5834\u5408\u306f\u3001<span class=\"text codecolorer\">subtree<\/span> \u30de\u30fc\u30b8\u6226\u7565\u3092\u4f7f\u7528\u3057\u3066 <span class=\"text codecolorer\">pull<\/span> \u3092\u5b9f\u884c\u3059\u308c\u3070\u3088\u3044\u3067\u3057\u3087\u3046:<\/p>\n<pre>\r\n\r\n<div class=\"codecolorer-container text mac-classic\" style=\"overflow:auto;white-space:nowrap;width:600px;\"><table cellspacing=\"0\" cellpadding=\"0\"><tbody><tr><td class=\"line-numbers\"><div>1<br \/><\/div><\/td><td><div class=\"text codecolorer\">git pull -s subtree tpope-vim-surround master<\/div><\/td><\/tr><\/tbody><\/table><\/div>\r\n\r\n<\/pre>\n<h2>\u7d50\u8ad6<\/h2>\n<p>\u79c1\u306f\u3057\u3070\u3089\u304f\u306e\u9593 <span class=\"text codecolorer\">submodule<\/span> \u3082\u4f7f\u3063\u3066\u307f\u307e\u3057\u305f\u304c\u3001<span class=\"text codecolorer\">subtree<\/span> \u3067\u306f <span class=\"text codecolorer\">submodule<\/span> \u3067\u767a\u751f\u3059\u308b\u307b\u3068\u3093\u3069\u306e\u554f\u984c\u304c\u89e3\u6c7a\u3055\u308c\u3066\u304a\u308a\u3001\u5f93\u3063\u3066 <span class=\"text codecolorer\">git subtree<\/span> \u306e\u65b9\u3092\u683c\u6bb5\u306b\u9ad8\u304f\u8a55\u4fa1\u3057\u3066\u3044\u307e\u3059\u3002\u3044\u3064\u3082\u306e\u3053\u3068\u3067\u3059\u304c\u3001Git \u306e\u6a5f\u80fd\u306f\u3069\u308c\u3082\u305d\u308c\u3092\u6d3b\u7528\u3059\u308b\u306b\u306f\u30e9\u30fc\u30cb\u30f3\u30b0\u30ab\u30fc\u30d6\u306b\u6cbf\u3063\u305f\u7d4c\u9a13\u304c\u5fc5\u8981\u306a\u306e\u3067\u3059\u3002<\/p>\n<p>Git \u306e\u7d20\u6674\u3089\u3057\u3055\u3092\u3082\u3063\u3068\u7406\u89e3\u3057\u305f\u3044\u65b9\u306f\u3001<a href=\"http:\/\/twitter.com\/durdn\">@durdn<\/a> \u3067\u79c1\u3092\u30d5\u30a9\u30ed\u30fc\u3057\u305f\u308a\u3001\u512a\u79c0\u306a\u958b\u767a\u30c1\u30fc\u30e0\u3067\u3042\u308b <a href=\"http:\/\/twitter.com\/AtlDevTools\">@AtlDevtools<\/a> \u3092\u30d5\u30a9\u30ed\u30fc\u3057\u3066\u304f\u3060\u3055\u3044\u3002 <\/p>\n<\/p><\/div>\n<p><!--\/postcontent--><\/p>\n<p><small>*\u672c\u30d6\u30ed\u30b0\u306f Atlassian Blogs \u306e\u7ffb\u8a33\u3067\u3059\u3002\u672c\u6587\u4e2d\u306e\u65e5\u6642\u306a\u3069\u306f\u6295\u7a3f\u5f53\u6642\u306e\u3082\u306e\u3067\u3059\u306e\u3067\u3054\u4e86\u627f\u304f\u3060\u3055\u3044\u3002<br \/>\n*\u539f\u6587 : 2013 \u5e74 3 \u6708 16 \u65e5 \"<a href=\"http:\/\/blogs.atlassian.com\/2013\/05\/alternatives-to-git-submodule-git-subtree\/\" target=\"_blank\">Alternatives To Git Submodule: Git Subtree<\/a>\"<\/small><\/p>\n","protected":false},"excerpt":{"rendered":"<p>\u30a4\u30f3\u30bf\u30fc\u30cd\u30c3\u30c8\u306b\u306f\u3001Git submodule \u3092\u4f7f\u3063\u3066\u306f \u3044\u3051\u306a\u3044 \u3068\u3044\u3046\u8a18\u4e8b\u304c\u98db\u3073\u4ea4\u3063\u3066\u3044\u307e\u3059\u3002\u79c1\u306f\u3053\u308c\u3089\u306e\u8a18\u4e8b\u304c\u8a00\u3046\u307b\u3069\u3072\u3069\u3044\u3082\u306e\u3068\u306f\u601d\u3063\u3066\u3044\u307e\u305b\u3093\u304c\u3001\u305d\u3046\u3044\u3063\u305f\u4e3b\u5f35\u304c\u5927\u65b9\u6b63&hellip;<\/p>\n","protected":false},"author":275,"featured_media":0,"comment_status":"open","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"_acf_changed":false,"bitbucket_subtitle":"","footnotes":""},"categories":[1],"tags":[86,103,250,369,370],"coauthors":[],"class_list":["post-2563","post","type-post","status-publish","format-standard","hentry","category-uncategorized","tag-dvcs","tag-git","tag-submodules","tag-subtree","tag-370"],"acf":[],"aioseo_notices":[],"_links":{"self":[{"href":"https:\/\/www.atlassian.com\/ja\/blog\/wp-json\/wp\/v2\/posts\/2563","targetHints":{"allow":["GET"]}}],"collection":[{"href":"https:\/\/www.atlassian.com\/ja\/blog\/wp-json\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/www.atlassian.com\/ja\/blog\/wp-json\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/www.atlassian.com\/ja\/blog\/wp-json\/wp\/v2\/users\/275"}],"replies":[{"embeddable":true,"href":"https:\/\/www.atlassian.com\/ja\/blog\/wp-json\/wp\/v2\/comments?post=2563"}],"version-history":[{"count":0,"href":"https:\/\/www.atlassian.com\/ja\/blog\/wp-json\/wp\/v2\/posts\/2563\/revisions"}],"wp:attachment":[{"href":"https:\/\/www.atlassian.com\/ja\/blog\/wp-json\/wp\/v2\/media?parent=2563"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/www.atlassian.com\/ja\/blog\/wp-json\/wp\/v2\/categories?post=2563"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/www.atlassian.com\/ja\/blog\/wp-json\/wp\/v2\/tags?post=2563"},{"taxonomy":"author","embeddable":true,"href":"https:\/\/www.atlassian.com\/ja\/blog\/wp-json\/wp\/v2\/coauthors?post=2563"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}