{"id":10049,"date":"2013-12-20T16:01:03","date_gmt":"2013-12-20T07:01:03","guid":{"rendered":"http:\/\/labs.gree.jp\/blog\/?p=10049"},"modified":"2013-12-22T09:58:11","modified_gmt":"2013-12-22T00:58:11","slug":"%e3%82%a4%e3%82%b1%e3%81%a6%e3%81%a6%e3%83%a4%e3%83%90%e3%81%84git%e5%85%a5%e9%96%80","status":"publish","type":"post","link":"https:\/\/labs.gree.jp\/blog\/2013\/12\/10049\/","title":{"rendered":"\u30a4\u30b1\u3066\u3066\u30e4\u30d0\u3044Git\u5165\u9580"},"content":{"rendered":"<p>\u3053\u306e\u6295\u7a3f\u306f<a href=\"http:\/\/labs.gree.jp\/blog\/2013\/11\/8799\/\">GREE Advent Calendar 2013<\/a> 20\u65e5\u76ee\u306e\u8a18\u4e8b\u3067\u3059\u3002<\/p>\n<p>\u30d7\u30ed\u30c7\u30e5\u30fc\u30b5\u30fc\u306e\u7686\u3055\u3093\u3001\u307f\u308a\u3063\u307b\u30fc\u3002<a href=\"https:\/\/www.google.co.jp\/search?q=%E9%80%B2%E6%8D%97%E3%81%A9%E3%81%86%E3%81%A7%E3%81%99%E3%81%8B\">\u9032\u6357\u3069\u3046\u3067\u3059\u304b<\/a>\uff1f\u79c1\u306f\u30c0\u30e1\u3067\u3059\u3002\u3054\u3081\u3093\u306a\u3055\u3044\u3002\uff08\u00b4\u30fb\u03c9\u30fb\uff40\uff09<br \/>WG\u4e8b\u696d\u90e8\u306e\u4e8c\u5bae\u3067\u3059\u3002\u4eca\u65e5\u306f\u30a2\u30a4\u30de\u30b9\u99c6\u52d5\u958b\u767a\u306e\u8a71\u3092\u3057\u3088\u3046\u304b\u3068\u601d\u3063\u305f\u306e\u3067\u3059\u304c\u3001\u6025\u907dGit\u306e\u4f7f\u3044\u65b9\u306e\u8a71\u306b\u5909\u66f4\u3057\u307e\u3057\u305f(Inspired by <a href=\"http:\/\/labs.gree.jp\/blog\/2013\/12\/9773\/\">\u5800\u53e3\u5148\u751f<\/a>)\u3002<\/p>\n<p>\u30a2\u30a4\u30de\u30b9\u99c6\u52d5\u958b\u767a\u306e\u8a71\u304c\u6c17\u306b\u306a\u308b\u65b9\u306f\u3001\u662f\u975e\u4e00\u7dd2\u306b\u98f2\u307f\u306b\u884c\u304d\u307e\u3057\u3087\u3046w<\/p>\n<p>\u203b\u3053\u306e\u8a18\u4e8b\u3067\u306f\u3001\u30c4\u30fc\u30eb\u306bGit\u3084GitHub\u3092\u5229\u7528\u3059\u308b\u3053\u3068\u3092\u60f3\u5b9a\u3057\u3066\u304a\u308a\u307e\u3059\u3002<\/p>\n<h1>Git\u3092\u30b9\u30de\u30fc\u30c8\u306b\u4f7f\u3044\u305f\u3044<\/h1>\n<p>\u30b0\u30ea\u30fc\u3067\u306f\u3001\u57fa\u672c\u7684\u306b<a href=\"http:\/\/nvie.com\/posts\/a-successful-git-branching-model\/\">A successful Git branching model<\/a>\uff08<a href=\"http:\/\/keijinsonyaban.blogspot.jp\/2010\/10\/successful-git-branching-model.html\">\u6709\u5fd7\u306e\u65b9\u306b\u3088\u308b\u65e5\u672c\u8a9e\u8a33<\/a>\uff09\u306b\u306e\u3063\u3068\u3063\u3066\u958b\u767a\u3057\u3066\u3044\u307e\u3059\u3002<\/p>\n<p>Git\u306b\u3064\u3044\u3066\u57fa\u672c\u7684\u306a\u8003\u3048\u65b9\u306e\u90e8\u5206\u306f<a href=\"http:\/\/labs.gree.jp\/blog\/2013\/12\/9773\/\">\u5800\u53e3\u3055\u3093\u306e\u8a18\u4e8b<\/a>\u3067\u8a00\u53ca\u3055\u308c\u3066\u3044\u308b\u306e\u3067\u3001\u79c1\u306f\u73fe\u5834\u3067\u5177\u4f53\u7684\u306b\u3069\u306e\u3088\u3046\u306a\u4f7f\u3044\u65b9\u3092\u3057\u3066\u3044\u308b\u306e\u304b\u306b\u3064\u3044\u3066\u66f8\u304d\u305f\u3044\u3068\u601d\u3044\u307e\u3059\u3002<\/p>\n<p>\u3068\u306f\u3044\u3048\u304b\u304f\u3044\u3046\u79c1\u3082\u4eca\u5e74\u6625\u304b\u3089\u307e\u3068\u3082\u306b\u4f7f\u3044\u59cb\u3081\u305f\u53e3\u306a\u306e\u3067\u3001\u300c\u305d\u308c\u306f\u3042\u304b\u3093\u3084\u308d\u300d\u300c\u3053\u3063\u3061\u306e\u65b9\u304c\u30b9\u30de\u30fc\u30c8\u3060\u305c\u300d\u7b49\u306e\u3054\u610f\u898b\u3082\u6b53\u8fce\u3067\u3059\u3002<\/p>\n<h1>\u5168\u822c\u306e\u8a2d\u5b9a(Git)<\/h1>\n<p>\u30af\u30e9\u30a4\u30a2\u30f3\u30c8\u5074\uff08\u5b9f\u969b\u306bgit\u30b3\u30de\u30f3\u30c9\u3092\u53e9\u304f\u74b0\u5883\u4e0a\uff09\u306e\u30bb\u30c3\u30c8\u30a2\u30c3\u30d7\u3092\u884c\u3044\u307e\u3057\u3087\u3046\u3002<\/p>\n<p>\u6700\u521d\u306b\u4e0b\u8a18\u306e\u30b3\u30de\u30f3\u30c9\u306b\u3088\u308a\u3001commit\u3057\u305f\u3068\u304d\u306e\u540d\u524d\u3084\u30e1\u30fc\u30eb\u30a2\u30c9\u30ec\u30b9\u3092\u8a2d\u5b9a\u3057\u3066\u304a\u304d\u307e\u3059\u3002<\/p>\n<pre>\n$ git config --global user.name \"Hiroaki Ninomiya\"\n$ git config --global user.email example@example.com\n<\/pre>\n<p>\u3082\u3063\u3068\u3082\u5b9f\u969b\u306e\u60c5\u5831\u306f\u30db\u30fc\u30e0\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u4ee5\u4e0b\u306e.gitconfig\u306b\u66f8\u304b\u308c\u308b\u306e\u3067\u3053\u308c\u3092\u7de8\u96c6\u3057\u3066\u3082\u3068\u3044\u3046\u5411\u304d\u3082\u3042\u308a\u307e\u3059\u304c\u3001\u305b\u3063\u304b\u304f\u30b3\u30de\u30f3\u30c9\u304c\u7528\u610f\u3055\u308c\u3066\u3044\u308b\u306e\u3067\u3053\u308c\u3092\u4f7f\u3063\u305f\u65b9\u304c\u304b\u3063\u3053\u3044\u3044\u3068\u500b\u4eba\u7684\u306b\u306f\u601d\u3044\u307e\u3059\u3002<\/p>\n<pre>\n$ cat ~\/.gitconfig\n[user]\n  name = Hiroaki Ninomiya\n  email = example@example.com\n<\/pre>\n<p>\u5fc5\u8981\u306b\u5fdc\u3058\u3066.DS_Store\u3084Thumb.db\u3068\u3044\u3063\u305f\u4f55\u304b\u306e\u30bf\u30a4\u30df\u30f3\u30b0\u3067\u7d1b\u308c\u305d\u3046\u306a\u3084\u3064\u3089\u3092gitignore\u3057\u3066\u304a\u304d\u307e\u3059\u3002<\/p>\n<pre>\n$ echo \".DS_Store\" >> ~\/.gitignore\n<\/pre>\n<p>\u307e\u305f\u3001GitHub\u306b\u767b\u9332\u3057\u305f\u516c\u958b\u9375\u3068\u5bfe\u306b\u306a\u308b\u79d8\u5bc6\u9375\u3092\u30db\u30fc\u30e0\/.ssh\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u4ee5\u4e0b\u306b\u914d\u7f6e\u3057\u3066\u304a\u304d\u307e\u3059\u3002<\/p>\n<h1>\u958b\u767a\u306e\u6e96\u5099(Git\/GitHub)<\/h1>\n<p>Git\u5171\u901a\u306e\u8a2d\u5b9a\u304c\u7d42\u308f\u3063\u305f\u3089\u3001\u958b\u767a\u306e\u6e96\u5099\u3092\u884c\u3044\u307e\u3059\u3002<\/p>\n<h2>\u521d\u671f\u4f5c\u696d<\/h2>\n<p>\u307e\u305a\u306fGitHub\u4e0a\u3067\u30aa\u30ea\u30b8\u30ca\u30eb\u306e\u30ea\u30dd\u30b8\u30c8\u30ea\u3092\u81ea\u5206\u306e\u30b9\u30da\u30fc\u30b9\u306bfork\u3057\u307e\u3059\u3002\u305d\u306e\u6642\u306e\u30ea\u30dd\u30b8\u30c8\u30ea\u306e\u72b6\u614b\u3092\u307e\u308b\u3063\u3068\u8907\u88fd\u3059\u308b\u308f\u3051\u3067\u3059\u306d\u3002\u306a\u304a\u3001\u3053\u3053\u3067\u8907\u88fd\u3057\u305f\u30ea\u30dd\u30b8\u30c8\u30ea\u306f\u30aa\u30ea\u30b8\u30ca\u30eb\u304b\u3089\u6d3e\u751f\u3055\u305b\u305f\u81ea\u5206\u306e\u3082\u306e\u306a\u306e\u3067\u81ea\u7531\u306b\u3044\u3058\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u3059\u3002\u3084\u3063\u305fNE\uff01<\/p>\n<p>\u305d\u3057\u3066\u305d\u308c\u3092\u81ea\u5206\u81ea\u8eab\u306e\u958b\u767a\u74b0\u5883\u306bclone\u3057\u3066\u304d\u307e\u3059\u3002<\/p>\n<pre>\n$ git clone git@(\u4e2d\u7565):hiroaki-ninomiya\/(\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u540d).git\n<\/pre>\n<p>\u958b\u767a\u74b0\u5883\u4e0a\u306e\u30ea\u30dd\u30b8\u30c8\u30ea\u306f\u30ed\u30fc\u30ab\u30eb\u30ea\u30dd\u30b8\u30c8\u30ea\u3068\u547c\u3070\u308c\u3001git commit\u306a\u3069\u57fa\u672c\u7684\u306a\u5909\u66f4\u306f\u3053\u306e\u958b\u767a\u74b0\u5883\u4e0a\u306e\u30ea\u30dd\u30b8\u30c8\u30ea\u306b\u5bfe\u3057\u3066\u884c\u308f\u308c\u307e\u3059\u3002\u3053\u306e\u6642\u70b9\u3067\u5404\u30ea\u30dd\u30b8\u30c8\u30ea\u306e\u95a2\u4fc2\u306f\u3001\u4ee5\u4e0b\u306e\u3088\u3046\u306b\u306a\u3063\u3066\u3044\u307e\u3059\u3002<\/p>\n<p><a href=\"http:\/\/labs.gree.jp\/blog\/wp-content\/uploads\/2013\/12\/20131220_ac2013_01.png\"><img decoding=\"async\" src=\"http:\/\/labs.gree.jp\/blog\/wp-content\/uploads\/2013\/12\/20131220_ac2013_01.png\" alt=\"20131220_ac2013_01\" width=\"300\" class=\"alignnone size-full wp-image-10150\" \/><\/a><\/p>\n<p>\u3053\u308c\u304c\u3082\u3057\u3001\u4e0b\u306e\u3088\u3046\u306b\u30aa\u30ea\u30b8\u30ca\u30eb\u306e\u30ea\u30dd\u30b8\u30c8\u30ea\u304b\u3089clone\u3057\u305f\u3068\u3057\u307e\u3059\u3002<\/p>\n<pre>\n$ git clone git@(\u4e2d\u7565):gree\/(\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u540d).git\n<\/pre>\n<p>\u3053\u306e\u5834\u5408\u3001\u5404\u30ea\u30dd\u30b8\u30c8\u30ea\u306e\u95a2\u4fc2\u306f\u3001\u4ee5\u4e0b\u306e\u3088\u3046\u306b\u306a\u3063\u3066\u3044\u307e\u3059\u3002<\/p>\n<p><a href=\"http:\/\/labs.gree.jp\/blog\/wp-content\/uploads\/2013\/12\/20131220_ac2013_02.png\"><img decoding=\"async\" src=\"http:\/\/labs.gree.jp\/blog\/wp-content\/uploads\/2013\/12\/20131220_ac2013_02.png\" alt=\"20131220_ac2013_02\" width=\"300\" class=\"alignnone size-full wp-image-10151\" \/><\/a><\/p>\n<p>git clone\u3057\u305f\u5143\u306e\u30ea\u30dd\u30b8\u30c8\u30ea\u304corigin\u3068\u306a\u308b\u3053\u3068\u304c\u304a\u5206\u304b\u308a\u3044\u305f\u3060\u3051\u305f\u3067\u3057\u3087\u3046\u304b\u3002<\/p>\n<p>\u30b3\u30fc\u30c9\u306b\u6539\u4fee\u3092\u884c\u3063\u305f\u5834\u5408\u3001\u30ed\u30fc\u30ab\u30eb\u30ea\u30dd\u30b8\u30c8\u30ea\u306b\u305d\u306e\u5909\u66f4\u304c\u53cd\u6620\u3055\u308c\u308b\u3053\u3068\u306f\u524d\u8ff0\u3057\u305f\u901a\u308a\u3067\u3059\u3002\u3067\u306f\u3001\u30ed\u30fc\u30ab\u30eb\u30ea\u30dd\u30b8\u30c8\u30ea\u306e\u72b6\u614b\u3092\u30ea\u30e2\u30fc\u30c8\u30ea\u30dd\u30b8\u30c8\u30ea\u306b\u53cd\u6620\u3055\u305b\u308b\u306b\u306f\u3069\u3046\u3057\u305f\u3089\u826f\u3044\u3067\u3057\u3087\u3046\u3002<\/p>\n<p>\u305d\u3046\u3067\u3059\u306d\u3001\u3053\u306e\u5c65\u6b74\u3092\u30ea\u30e2\u30fc\u30c8\u30ea\u30dd\u30b8\u30c8\u30ea\u306b\u53cd\u6620\u3055\u305b\u308b\u306b\u306fgit push\u3059\u308c\u3070\u3088\u3044\u3067\u3059\u3002\u9006\u306b\u30aa\u30ea\u30b8\u30ca\u30eb\u306e\u30ea\u30e2\u30fc\u30c8\u30ea\u30dd\u30b8\u30c8\u30ea\u306b\u5909\u66f4\u304c\u52a0\u3048\u3089\u308c\u305f\u5834\u5408\u3001\u3053\u308c\u3092\u53d6\u5f97\u3059\u308b\u305f\u3081\u306bgit pull(git fetch + git merge)\u3057\u3066\u304f\u308c\u3070\u3088\u3044\u3067\u3059\u3002<\/p>\n<p>\u3068\u3044\u3063\u305f\u3068\u3053\u308d\u3067\u3001\u5148\u307b\u3069\u306e\u56f3\u3060\u3068\u30ea\u30e2\u30fc\u30c8\u30ea\u30dd\u30b8\u30c8\u30ea\u304c\u81ea\u5206\u306e\u3082\u306e\u3068\u30aa\u30ea\u30b8\u30ca\u30eb\u306e\u3082\u306e\u306e\u4e8c\u3064\u3042\u308b\u3053\u3068\u306b\u304a\u6c17\u3065\u304d\u3067\u3057\u3087\u3046\u304b\u3002<\/p>\n<p>Git\u3067\u306f\u3001git clone\u3057\u305f\u30ea\u30e2\u30fc\u30c8\u30ea\u30dd\u30b8\u30c8\u30ea\u304corigin\u3068\u3057\u3066\u547d\u540d\u3055\u308c\u3066\u3044\u307e\u3059\u3002\u3053\u306e\u3053\u3068\u306f\u4ee5\u4e0b\u306e\u3088\u3046\u306b\u8abf\u3079\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u3059\u3002fork\u3057\u305f\u81ea\u5206\u306e\u30ea\u30dd\u30b8\u30c8\u30ea\u3092clone\u3057\u305f\u5834\u5408\u306f\u6b21\u306e\u3088\u3046\u306b\u306a\u3063\u3066\u3044\u308b\u306f\u305a\u3067\u3059\u3002<\/p>\n<pre>\n$ git remote -v\norigin  git@(\u4e2d\u7565):hiroaki-ninomiya\/(\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u540d).git (fetch)\norigin  git@(\u4e2d\u7565):hiroaki-ninomiya\/(\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u540d).git (push)\n<\/pre>\n<p>\u3053\u308c\u304c\u3082\u3057\u3001\u30aa\u30ea\u30b8\u30ca\u30eb\u306e\u30ea\u30dd\u30b8\u30c8\u30ea\u3092clone\u3057\u305f\u5834\u5408\u306f\u6b21\u306e\u3088\u3046\u306b\u306a\u3063\u3066\u3044\u308b\u3067\u3057\u3087\u3046\u3002<\/p>\n<pre>\n$ git remote -v\norigin  git@(\u4e2d\u7565):gree\/(\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u540d).git (fetch)\norigin  git@(\u4e2d\u7565):gree\/(\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u540d).git (push)\n<\/pre>\n<p>\u3053\u3053\u3067\u306f\u3001fork\u3057\u305f\u81ea\u5206\u306e\u30ea\u30e2\u30fc\u30c8\u30ea\u30dd\u30b8\u30c8\u30ea\u3092clone\u3057\u305f(\u524d\u8005\u306e\u30d1\u30bf\u30fc\u30f3)\u3068\u3057\u3066\u66f8\u3044\u3066\u3044\u304d\u307e\u3059\u3002<\/p>\n<p><a href=\"http:\/\/labs.gree.jp\/blog\/wp-content\/uploads\/2013\/12\/20131220_ac2013_03.png\"><img decoding=\"async\" src=\"http:\/\/labs.gree.jp\/blog\/wp-content\/uploads\/2013\/12\/20131220_ac2013_03.png\" alt=\"20131220_ac2013_03\" width=\"300\" class=\"alignnone size-full wp-image-10146\" \/><\/a><\/p>\n<p>\u3053\u306e\u5834\u5408\u3001\u30ed\u30fc\u30ab\u30eb\u30ea\u30dd\u30b8\u30c8\u30ea\u3068\u30aa\u30ea\u30b8\u30ca\u30eb\u306e\u30ea\u30dd\u30b8\u30c8\u30ea\u306e\u9593\u3067git fetch(git pull)\/git push\u3059\u308b\u3053\u3068\u304c\u3067\u304d\u306a\u3044\u306e\u3067\u3001\u6b21\u306e\u3088\u3046\u306b\u767b\u9332\u3059\u308b\u3068\u3088\u3044\u3067\u3057\u3087\u3046\u3002<\/p>\n<pre>\n$ git remote add upstream git@(\u4e2d\u7565):gree\/(\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u540d).git\n<\/pre>\n<p>\u30b3\u30de\u30f3\u30c9\u3092\u5b9f\u884c\u3057\u305f\u5f8c\u306e\u72b6\u614b\u3092\u4e0b\u56f3\u306b\u793a\u3057\u307e\u3059\u3002<\/p>\n<p><a href=\"http:\/\/labs.gree.jp\/blog\/wp-content\/uploads\/2013\/12\/20131220_ac2013_04.png\"><img decoding=\"async\" src=\"http:\/\/labs.gree.jp\/blog\/wp-content\/uploads\/2013\/12\/20131220_ac2013_04.png\" alt=\"20131220_ac2013_04\" width=\"300\" class=\"alignnone size-full wp-image-10147\" \/><\/a><\/p>\n<pre>\n$ git remote -v\norigin  git@(\u4e2d\u7565):hiroaki-ninomiya\/(\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u540d).git (fetch)\norigin  git@(\u4e2d\u7565):hiroaki-ninomiya\/(\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u540d).git (push)\nupstream  git@(\u4e2d\u7565):gree\/(\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u540d).git (fetch)\nupstream  git@(\u4e2d\u7565):gree\/(\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u540d).git (push)\n<\/pre>\n<p>gree\/(\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u540d).git\u304c\u30c1\u30fc\u30e0\u3067\u958b\u767a\u3057\u3066\u3044\u308b\u30ea\u30dd\u30b8\u30c8\u30ea\u3001hiroaki-ninomiya\/(\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u540d).git\u304c\u81ea\u5206\u306e\u30ea\u30dd\u30b8\u30c8\u30ea\u3068\u3044\u3046\u30a4\u30e1\u30fc\u30b8\u3067\u3059\u3002<\/p>\n<p>\u306a\u304a\u3001\u4f59\u8ac7\u3067\u6700\u521d\u306b\u30aa\u30ea\u30b8\u30ca\u30eb\u306e\u30ea\u30dd\u30b8\u30c8\u30ea\u3092clone\u3057\u3066\u304d\u3066\u3044\u305f\u5834\u5408\u306e\u6ce8\u610f\u3067\u3059\u304c\u3001<\/p>\n<p><a href=\"http:\/\/labs.gree.jp\/blog\/wp-content\/uploads\/2013\/12\/20131220_ac2013_02.png\"><img decoding=\"async\" src=\"http:\/\/labs.gree.jp\/blog\/wp-content\/uploads\/2013\/12\/20131220_ac2013_02.png\" alt=\"20131220_ac2013_02\" width=\"300\" class=\"alignnone size-full wp-image-10151\" \/><\/a><\/p>\n<p>\u81ea\u5206\u304c\u95a2\u308f\u308b\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306e\u5834\u5408\u3001\u30aa\u30ea\u30b8\u30ca\u30eb\u306e\u540d\u524d\u3092origin\u306e\u307e\u307e\u306b\u3057\u3066\u304a\u304f\u3068\u4e8b\u6545\u306e\u5143\u3067\u3059\u3002git push -f\u306a\u3069\u3057\u3066\u3057\u307e\u3046\u3068\u3001\u30c7\u30d5\u30a9\u30eb\u30c8\u3067origin\u304c\u8a2d\u5b9a\u3055\u308c\u3066\u3057\u307e\u3046\u304b\u3089\u3067\u3059\u3002\u3084\u306f\u308a\u3053\u306e\u5834\u5408\u3082\u30aa\u30ea\u30b8\u30ca\u30eb\u306e\u30ea\u30dd\u30b8\u30c8\u30ea\u306e\u540d\u524d\u3092upstream\u3068\u304b\u306b\u3057\u3066\u304a\u304f\u3068\u3088\u308d\u3057\u3044\u3067\u3059\u3002\u4e8b\u6545\u308b\u3068\u60b2\u3057\u3044\u3067\u3059\u3002<\/p>\n<pre>\n$ git remote rename origin upstream\n<\/pre>\n<h2>\u6539\u4fee\u306e\u958b\u59cb<\/h2>\n<p>\u3055\u3066\u3001\u3044\u3088\u3044\u3088\u958b\u767a\u3092\u59cb\u3081\u308b\u306b\u3042\u305f\u308a\u3001Git\u7ba1\u7406\u4e0b\u306b\u7f6e\u304b\u308c\u3066\u3044\u308b\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u306b\u79fb\u52d5\u3057\u3066develop\u30d6\u30e9\u30f3\u30c1\u306b\u5207\u308a\u66ff\u3048\u3066\u304a\u304d\u307e\u3057\u3087\u3046\u3002<\/p>\n<pre>\n$ cd (\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u540d)\n$ git checkout develop\n<\/pre>\n<p>\u3053\u3053\u3067\u3044\u308f\u3086\u308bfeature\u30d6\u30e9\u30f3\u30c1\u3092\u4f5c\u6210\u3059\u308b\u306e\u3067\u3059\u304c\u3001\u30aa\u30ea\u30b8\u30ca\u30eb\u306edevelop\u30d6\u30e9\u30f3\u30c1\u306b\u5909\u66f4\u304c\u3042\u3063\u305f\u5834\u5408\u3001\u81ea\u5206\u306e\u30ea\u30dd\u30b8\u30c8\u30ea\u306edevelop\u30d6\u30e9\u30f3\u30c1\u3088\u308a\u6b74\u53f2\u304c\u9032\u3093\u3067\u3044\u308b\u3053\u3068\u304c\u3042\u308a\u307e\u3059\u3002<\/p>\n<p><a href=\"http:\/\/labs.gree.jp\/blog\/wp-content\/uploads\/2013\/12\/20131220_ac2013_05.png\"><img decoding=\"async\" src=\"http:\/\/labs.gree.jp\/blog\/wp-content\/uploads\/2013\/12\/20131220_ac2013_05.png\" alt=\"20131220_ac2013_05\" width=\"300\" class=\"alignnone size-full wp-image-10148\" \/><\/a><\/p>\n<p>\u3068\u3044\u3046\u3088\u308a\u3001\u5b9f\u52d9\u3067\u306f\u5927\u62b5\u9032\u3093\u3067\u3044\u308b\u306e\u3067\u3001\u524d\u8ff0\u306e\u8a2d\u5b9a\u3092\u3057\u305f\u76f4\u5f8c\u3067\u306a\u3051\u308c\u3070\u6b21\u306e\u30b3\u30de\u30f3\u30c9\u3067\u6700\u65b0\u306e\u72b6\u6cc1\u3092\u53d6\u5f97\u3057\u3066\u304a\u304d\u307e\u3057\u3087\u3046\u3002<\/p>\n<pre>\n$ git pull --rebase upstream develop\n<\/pre>\n<p><a href=\"http:\/\/labs.gree.jp\/blog\/wp-content\/uploads\/2013\/12\/20131220_ac2013_06.png\"><img decoding=\"async\" src=\"http:\/\/labs.gree.jp\/blog\/wp-content\/uploads\/2013\/12\/20131220_ac2013_06.png\" alt=\"20131220_ac2013_06\" width=\"300\" class=\"alignnone size-full wp-image-10149\" \/><\/a><\/p>\n<p>\u4efb\u610f\u3067\u3001GitHub\u4e0a\u306e\u81ea\u5206\u306e\u30ea\u30dd\u30b8\u30c8\u30ea\u306b\u53cd\u6620\u3055\u305b\u3066\u3082\u3088\u3044\u3067\u3057\u3087\u3046\u3002<\/p>\n<pre>\n$ git push origin develop\n<\/pre>\n<p><a href=\"http:\/\/labs.gree.jp\/blog\/wp-content\/uploads\/2013\/12\/20131220_ac2013_07.png\"><img decoding=\"async\" src=\"http:\/\/labs.gree.jp\/blog\/wp-content\/uploads\/2013\/12\/20131220_ac2013_07.png\" alt=\"20131220_ac2013_07\" width=\"300\" class=\"alignnone size-full wp-image-10145\" \/><\/a><\/p>\n<p>develop\u30d6\u30e9\u30f3\u30c1\u3092\u6700\u65b0\u306e\u72b6\u614b\u306b\u3057\u305f\u3089\u305d\u3053\u304b\u3089feature\u30d6\u30e9\u30f3\u30c1\u3092\u4f5c\u308a\u307e\u3059\u3002\u5b9f\u969b\u306e\u547d\u540d\u898f\u5247\u306f\u30c1\u30fc\u30e0\u306b\u3088\u308a\u3051\u308a\u306e\u3088\u3046\u3067\u3059\u304c\u3001\u3053\u308c\u307e\u3067\u898b\u3066\u304d\u305f\u3068\u3053\u308d\u3067\u306f\u30c1\u30b1\u30c3\u30c8\u756a\u53f7\u3092\u5165\u308c\u305f\u308a\u3001\u65e5\u4ed8\u3068\u6982\u8981\u3092\u5165\u308c\u305f\u308a\u3057\u3066\u3044\u307e\u3057\u305f\u3002develop\u30d6\u30e9\u30f3\u30c1\u3067\u4ee5\u4e0b\u306e\u30b3\u30de\u30f3\u30c9\u3092\u5b9f\u884c\u3057\u3001\u30b3\u30fc\u30c9\u6539\u4fee\u306e\u305f\u3081\u306e\u30d6\u30e9\u30f3\u30c1\u3092\u5207\u308a\u307e\u3057\u3087\u3046\u3002<\/p>\n<pre>\n$ git checkout -b feature\/imas_sukidesu\n<\/pre>\n<p>feature\u30d6\u30e9\u30f3\u30c1\u3092\u4f5c\u308b\u3068\u3053\u308d\u307e\u3067\u3044\u3063\u305f\u3089\u3001\u3042\u3068\u306f\u6539\u4fee\u306b\u5c02\u5ff5\u3057\u307e\u3057\u3087\u3046\u3002\u5fc5\u8981\u306b\u5fdc\u3058\u3066git add\u3084git commit\u306a\u3069\u3092\u884c\u3063\u3066\u304f\u3060\u3055\u3044\u3002<\/p>\n<h1>\u30a4\u30b1\u3066\u3066\u30e4\u30d0\u3044Pull Request\u3092\u51fa\u3059\u305f\u3081\u306e\u30d1\u30bf\u30fc\u30f3<\/h1>\n<p>Pull Request\u3092\u51fa\u3059\u305f\u3081\u306b\u3001\u307e\u305a\u306fGitHub\u4e0a\u306e\u81ea\u5206\u306e\u30ea\u30dd\u30b8\u30c8\u30ea\u306b\u5909\u66f4\u3092\u53cd\u6620\u3055\u305b\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002\u6539\u4fee\u3092\u884c\u3063\u305f\u30d6\u30e9\u30f3\u30c1\u3092\u305d\u306e\u307e\u307epush\u3059\u308b\u3060\u3051\u3067\u3059\u3002<\/p>\n<pre>\n$ git push origin feature\/imas_sukidesu\n<\/pre>\n<p>\u304c\u3001\u6642\u3068\u5834\u5408\u3001\u30c1\u30fc\u30e0\u6587\u5316\u306b\u3088\u3063\u3066\u306f\u3053\u306e\u57fa\u672c\u30d1\u30bf\u30fc\u30f3\u304c\u4e0d\u9069\u5207\u3068\u306a\u308b\u3053\u3068\u304c\u3042\u308a\u307e\u3059\u3002\u4ee5\u4e0b\u3001\u53c2\u8003\u3068\u3057\u3066Pull Request\u3092\u51fa\u3059\u305f\u3081\u306e\u3044\u304f\u3064\u304b\u306e\u30d1\u30bf\u30fc\u30f3\u3092\u7d39\u4ecb\u3057\u307e\u3059\u3002<\/p>\n<h2>squash\u3059\u308b\u30d1\u30bf\u30fc\u30f3<\/h2>\n<p>\u305f\u3060\u3001\u3042\u307e\u308a\u306bcommit\u304c\u591a\u3059\u304e\u308b\u3068\u304d\u306fcommit\u4e00\u3064\u306b\u307e\u3068\u3081\u305f\u65b9\u304c\u30b9\u30de\u30fc\u30c8\u306a\u5834\u5408\u3082\u3042\u308a\u307e\u3059\u3002\u3084\u308a\u65b9\u3068\u3057\u3066\u306f\u3001\u6539\u4fee\u5f8c\u4e00\u65e6develop\u30d6\u30e9\u30f3\u30c1\u306b\u30c1\u30a7\u30c3\u30af\u30a2\u30a6\u30c8\u3057\u3066\u3001Pull Request\u7528\u306e\u30d6\u30e9\u30f3\u30c1\u3092\u5207\u308a\u306a\u304a\u3057\u305f\u5f8c\u3001\u305d\u306e\u30d6\u30e9\u30f3\u30c1\u306b\u5909\u66f4\u3092\u30de\u30fc\u30b8\u3057\u3066commit\u3059\u308b\u3053\u3068\u3067commit\u3092\u4e00\u3064\u306b\u307e\u3068\u3081\u307e\u3059\u3002<\/p>\n<pre>\n$ git checkout develop\n$ git checkout -b feature\/20131220_imas_cho_sukidesu\n$ git merge --squash feature\/imas_sukidesu\n$ git commit -m 'SSA ikitai.'\n<\/pre>\n<h2>rebase\u3059\u308b\u30d1\u30bf\u30fc\u30f3<\/h2>\n<p>\u30aa\u30ea\u30b8\u30ca\u30eb\u306e\u30ea\u30dd\u30b8\u30c8\u30ea\u306b\u6539\u4fee\u304c\u5165\u3063\u3066\u3044\u308b\u5834\u5408\u3001rebase\u3057\u305f\u65b9\u304c\u826f\u3044\u3053\u3068\u3082\u3042\u308a\u307e\u3059\u3002\u5177\u4f53\u7684\u306b\u306f\u4ee5\u4e0b\u306e\u624b\u9806\u3092\u884c\u3044\u307e\u3059\u3002<\/p>\n<pre>\n$ git checkout develop\n$ git pull --rebase upstream develop\n$ git checkout feature\/imas_sukidesu\n$ git rebase develop\n<\/pre>\n<h2>develop\u30d6\u30e9\u30f3\u30c1\u3092feature\u30d6\u30e9\u30f3\u30c1\u306bmerge --no-ff\u3059\u308b\u30d1\u30bf\u30fc\u30f3<\/h2>\n<p>\u307e\u305f\u3001\u6539\u4fee\u7bc4\u56f2\u304c\u5927\u304d\u3044\u5834\u5408\u306f\u3001\u3080\u3057\u308dfeature\u30d6\u30e9\u30f3\u30c1\u306bdevelop\u306e\u6700\u65b0\u72b6\u6cc1\u3092merge\u3057\u305f\u65b9\u304c\u826f\u3044\u304b\u3082\u3057\u308c\u307e\u305b\u3093\u3002\uff08--no-ff\u3092\u3064\u3051\u308b\u3053\u3068\u3067merge\u3057\u305f\u5c65\u6b74\u3092\u6b8b\u3057\u307e\u3059\uff09\u3002 \u3084\u308a\u65b9\u3068\u3057\u3066\u306f\u3001develop\u30d6\u30e9\u30f3\u30c1\u3092\u6700\u65b0\u306e\u72b6\u614b\u306b\u3057\u305f\u4e0a\u3067\u4ee5\u4e0b\u306e\u30b3\u30de\u30f3\u30c9\u3092feature\u30d6\u30e9\u30f3\u30c1\u4e0a\u3067\u5b9f\u884c\u3057\u307e\u3059\u3002<\/p>\n<pre>\n$ git merge --no-ff develop\n<\/pre>\n<p>\u7121\u4e8b\u3001Pull Request\u3092\u901a\u904e\u3057merge\u3055\u308c\u305f\u3089\u3001\u3044\u3088\u3044\u3088\u30ea\u30ea\u30fc\u30b9\u3067\u3059\u3002\u304a\u75b2\u308c\u69d8\u3067\u3057\u305f\u3002<\/p>\n<h1>\u307e\u3068\u3081<\/h1>\n<p>Git\u3063\u3066\u3001\u3059\u3054\u3044\u3067\u3059\u3088\u306d\u3002 \u77e5\u308c\u3070\u77e5\u308b\u307b\u3069\u3042\u308c\u3082\u4f7f\u3063\u3066\u307f\u305f\u3044\u3001\u3053\u308c\u3082\u4f7f\u3063\u3066\u307f\u305f\u3044\u304c\u51fa\u3066\u304d\u3066\u30a2\u30a4\u30de\u30b9\u3068\u540c\u3058\u304f\u3089\u3044\u697d\u3057\u3044\u3067\u3059\u3002<\/p>\n<p>\u3055\u3066\u3001<a href=\"http:\/\/labs.gree.jp\/blog\/2013\/12\/10084\/\">\u660e\u65e5\u306f\u30a2\u30b4\u3072\u3052\u304c\u30c0\u30f3\u30c7\u30a3\u30fc\u306a\u4e5d\u5ca1\u3055\u3093<\/a>\uff08<a href=\"https:\/\/twitter.com\/mumoshu\">@mumoshu<\/a>\uff09\u3067\u3059\u3002\u6c0f\u3068\u306f\u5947\u3057\u304f\u3082\u3053\u306e\u4e09\u9023\u4f11\u3067<a href=\"http:\/\/enchantjs.com\/ja\/\">enchant.js<\/a>\u3092\u4f7f\u3063\u3066\u5171\u95d8\u3059\u308b\u3053\u3068\u306b\u306a\u308a\u307e\u3057\u305f\u3001\u3088\u308d\u3057\u304f\u304a\u9858\u3044\u3057\u307e\u3059\uff01<\/p>\n<p>\u305d\u308c\u3067\u306f\u7686\u3055\u3093\u3001\u307f\u308a\u304a\u3063\u3064\u30fc\u3067\u3057\u305f\u30022014\u5e74\u3082\u30a2\u30a4\u30de\u30b9\u3067\u3059\u3088\u3001\u30a2\u30a4\u30de\u30b9\uff01<\/p>\n","protected":false},"excerpt":{"rendered":"<p>\u3053\u306e\u6295\u7a3f\u306fGREE Advent Calendar 2013 20\u65e5\u76ee\u306e\u8a18\u4e8b\u3067\u3059\u3002 \u30d7\u30ed\u30c7\u30e5\u30fc\u30b5\u30fc\u306e\u7686\u3055\u3093\u3001\u307f\u308a\u3063\u307b\u30fc\u3002\u9032\u6357\u3069\u3046\u3067\u3059\u304b\uff1f\u79c1\u306f\u30c0\u30e1\u3067\u3059\u3002\u3054\u3081\u3093\u306a\u3055\u3044\u3002\uff08\u00b4\u30fb\u03c9\u30fb\uff40\uff09WG\u4e8b\u696d\u90e8\u306e\u4e8c\u5bae\u3067\u3059\u3002\u4eca\u65e5\u306f\u30a2\u30a4\u30de\u30b9\u99c6\u52d5\u958b [&hellip;]<\/p>\n","protected":false},"author":52,"featured_media":0,"comment_status":"closed","ping_status":"closed","sticky":false,"template":"","format":"standard","meta":{"_jetpack_memberships_contains_paid_content":false,"footnotes":""},"categories":[],"tags":[54,33],"class_list":["post-10049","post","type-post","status-publish","format-standard","has-post-thumbnail","hentry","tag-advent-calendar","tag-git"],"jetpack_featured_media_url":"","jetpack_sharing_enabled":true,"_links":{"self":[{"href":"https:\/\/labs.gree.jp\/blog\/wp-json\/wp\/v2\/posts\/10049","targetHints":{"allow":["GET"]}}],"collection":[{"href":"https:\/\/labs.gree.jp\/blog\/wp-json\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/labs.gree.jp\/blog\/wp-json\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/labs.gree.jp\/blog\/wp-json\/wp\/v2\/users\/52"}],"replies":[{"embeddable":true,"href":"https:\/\/labs.gree.jp\/blog\/wp-json\/wp\/v2\/comments?post=10049"}],"version-history":[{"count":3,"href":"https:\/\/labs.gree.jp\/blog\/wp-json\/wp\/v2\/posts\/10049\/revisions"}],"predecessor-version":[{"id":10219,"href":"https:\/\/labs.gree.jp\/blog\/wp-json\/wp\/v2\/posts\/10049\/revisions\/10219"}],"wp:attachment":[{"href":"https:\/\/labs.gree.jp\/blog\/wp-json\/wp\/v2\/media?parent=10049"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/labs.gree.jp\/blog\/wp-json\/wp\/v2\/categories?post=10049"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/labs.gree.jp\/blog\/wp-json\/wp\/v2\/tags?post=10049"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}