{"height":"190","provider_url":"https://hatena.blog","author_url":"https://blog.hatena.ne.jp/alexam/","html":"<iframe src=\"https://hatenablog-parts.com/embed?url=https%3A%2F%2Falexam.hateblo.jp%2Fentry%2F2014%2F05%2F25%2F123643\" title=\"Android\u30a2\u30d7\u30ea\u958b\u767a\uff08Eclipse\uff09\u3067\u5feb\u9069\u306aGitHub\u30e9\u30a4\u30d5\u3092\u9001\u308b - shikato&#39;s blog\" class=\"embed-card embed-blogcard\" scrolling=\"no\" frameborder=\"0\" style=\"display: block; width: 100%; height: 190px; max-width: 500px; margin: 10px 0px;\"></iframe>","description":"\u6700\u8fd1\u306eEclipse\u306b\u306fEgit\u3068\u3044\u3046\u3001Eclipse\u4e0a\u3067git\u3092\u4f7f\u3046\u305f\u3081\u306e\u30d7\u30e9\u30b0\u30a4\u30f3\u304c\u6700\u521d\u304b\u3089\u30a4\u30f3\u30b9\u30c8\u30fc\u30eb\u3055\u308c\u3066\u3044\u308b\u3051\u3069\u3001\u3053\u308c\u304c\u3068\u3066\u3064\u3082\u306a\u304f\u4f7f\u3044\u3065\u3089\u304b\u3063\u305f\u3002 \u30bf\u30fc\u30df\u30ca\u30eb\u4e0a\u3067\u306egit\u64cd\u4f5c\u306b\u6163\u308c\u3066\u3044\u308b\u3068\u3001 git merge --no-ff hoge\u3063\u3066Egit\u3067\u3069\u3046\u3084\u308b\u3093\u3060\u3063\u3051\uff1f\u307f\u305f\u3044\u306a\u611f\u3058\u3067\u3001\u30b3\u30de\u30f3\u30c9\u3060\u3068\u76f4\u3050\u53e9\u3051\u308b\u306e\u306bEgit\u3060\u3068\u8abf\u3079\u306a\u3044\u3068\u3044\u3051\u306a\u3044\u3001\u307f\u305f\u3044\u306a\u72b6\u6cc1\u304c\u7169\u308f\u3057\u304b\u3063\u305f\u3002 \u306a\u306e\u3067\u3001Eclipse\u3067Git\uff08GitHub\uff09\u4f7f\u3046\u6642\u3082\u30b3\u30de\u30f3\u30c9\u3067\u64cd\u4f5c\u3059\u308b\u3088\u3046\u306b\u3057\u305f\u3002 Windows\u3060\u3068Git BASH\u304c\u4fbf\u5229\u3060\u3063\u305f\u3002 Git BASH\u306f\u4ee5\u4e0b\u304b\u3089\u30c0\u30a6\u30f3\u30ed\u30fc\u30c9\u3067\u304d\u308b\u3002 Git for Windows \u2026","blog_title":"shikato's blog","type":"rich","image_url":"http://cdn-ak.f.st-hatena.com/images/fotolife/a/alexam/20140525/20140525005959.png","author_name":"alexam","title":"Android\u30a2\u30d7\u30ea\u958b\u767a\uff08Eclipse\uff09\u3067\u5feb\u9069\u306aGitHub\u30e9\u30a4\u30d5\u3092\u9001\u308b","url":"https://alexam.hateblo.jp/entry/2014/05/25/123643","width":"100%","published":"2014-05-25 12:36:43","categories":["windows","Android","Eclipse"],"blog_url":"https://alexam.hateblo.jp/","provider_name":"Hatena Blog","version":"1.0"}