{"version":"1.0","blog_url":"https://2k0ri.hatenablog.com/","image_url":null,"categories":[],"width":"100%","html":"<iframe src=\"https://hatenablog-parts.com/embed?url=https%3A%2F%2F2k0ri.hatenablog.com%2Fentry%2F2014%2F04%2F29%2F195456\" title=\"git merge --no-ff\u3092\u30c7\u30d5\u30a9\u30eb\u30c8\u306b\u3057\u305f\u3089\u3081\u3093\u3069\u304f\u3055\u3044\u76ee\u306b\u3042\u3063\u305f - \u3057\u305f\u305f\u3081\u306a\u3051\u308c\u3070\u3044\u304d\u306e\u3053\u308c\u306a\u3044\" class=\"embed-card embed-blogcard\" scrolling=\"no\" frameborder=\"0\" style=\"display: block; width: 100%; height: 190px; max-width: 500px; margin: 10px 0px;\"></iframe>","type":"rich","height":"190","author_name":"K2ICE","blog_title":"\u3057\u305f\u305f\u3081\u306a\u3051\u308c\u3070\u3044\u304d\u306e\u3053\u308c\u306a\u3044","provider_url":"https://hatena.blog","description":"(\u8ffd\u4f38\uff1a2014-05-06 git merge --no-ff\u306f\u60aa\u8005\u3067\u306f\u306a\u304b\u3063\u305f - \u3057\u305f\u305f\u3081\u306a\u3051\u308c\u3070\u3044\u304d\u306e\u3053\u308c\u306a\u3044) git config --global merge.ff false \u3067non-forward\u30de\u30fc\u30b8\u3092\u30c7\u30d5\u30a9\u30eb\u30c8\u306b\u3057\u3066\u3044\u305f\u306e\u3067\u3059\u304c\u3001 brew update\u3068\u304bupgrade_oh_my_zsh\u3068\u304b \u30a2\u30c3\u30d7\u30c7\u30fc\u30c8\u306e\u305f\u3073\u306b\u30a8\u30c7\u30a3\u30bf\u304c\u7acb\u3061\u4e0a\u304c\u3063\u3066\u5927\u5909\u306b\u9762\u5012\u304f\u3055\u304f\u306a\u3063\u305f\u3002 \u65b0\u3057\u304f\u30d6\u30e9\u30f3\u30c1\u5207\u308b\u304b\u3089\u6bce\u56de\u30b3\u30e1\u30f3\u30c8\u3057\u305f\u305f\u3081\u306a\u3044\u3068\u3044\u3051\u306a\u304f\u306a\u308b\u3093\u3067\u3059\u306d\u3002 git-flow\u904b\u7528\u306f--no-ff\u306e\u65b9\u304c\u5404\u30d6\u30e9\u30f3\u30c1\u306e\u8ef8\u304c\u52d5\u304b\u306a\u304f\u3066\u898b\u901a\u3057\u304c\u826f\u3044\u3089\u3057\u3044\u306e\u3060\u3051\u3069 \u3053\u306e\u4e00\u4ef6\u3092\u8e0f\u307e\u3048\u3066\u30ea\u30dd\u30b8\u30c8\u30ea\u3054\u3068\u306b\u3061\u3083\u3093\u3068\u2026","published":"2014-04-29 19:54:56","provider_name":"Hatena Blog","title":"git merge --no-ff\u3092\u30c7\u30d5\u30a9\u30eb\u30c8\u306b\u3057\u305f\u3089\u3081\u3093\u3069\u304f\u3055\u3044\u76ee\u306b\u3042\u3063\u305f","author_url":"https://blog.hatena.ne.jp/K2ICE/","url":"https://2k0ri.hatenablog.com/entry/2014/04/29/195456"}