{"author_url":"https://blog.hatena.ne.jp/K2ICE/","type":"rich","url":"https://2k0ri.hatenablog.com/entry/2014/05/06/135338","width":"100%","image_url":null,"categories":[],"blog_url":"https://2k0ri.hatenablog.com/","version":"1.0","description":"\u524d\u306b\u66f8\u3044\u305fmerge.ff\u304c\u30de\u30fc\u30b8\u30e1\u30c3\u30bb\u30fc\u30b8\u3068\u306f\u5168\u304f\u95a2\u4fc2\u306a\u304b\u3063\u305f\u3053\u3068\u306b \u3064\u3044\u6700\u8fd1\u306b\u306a\u3063\u3066\u6c17\u3065\u304d\u307e\u3057\u305f\u3002 \u30db\u30f3\u30c8\u306e\u89e3\u6c7a\u7b56\u306f\u30b3\u30ec\u3002 echo 'export GIT_MERGE_AUTOEDIT=no' >> ~/.oh-my-zsh/custom/git.zsh >>\u4ee5\u964d\u306f\u3088\u3057\u306a\u306b\u3002\u81ea\u5206\u306foh-my-zsh\u4f7f\u3044\u306a\u306e\u3067custom\u4ee5\u4e0b\u306b\u30e2\u30b8\u30e5\u30fc\u30eb\u3068\u3057\u3066\u66f8\u304d\u307e\u3057\u305f\u3002.zshrc\u304c\u8d70\u67fb\u3059\u308c\u3070\u3002 \u3053\u306e\u9593\u307e\u3067\u306f\u5168\u7136\u6c17\u306b\u306a\u3089\u306a\u304b\u3063\u305f\u306e\u3067\u3059\u304c\u3001git 1.7.10\u4ee5\u4e0a\u3067\u306f\u30de\u30fc\u30b8\u30e1\u30c3\u30bb\u30fc\u30b8\u306f\u30c7\u30d5\u30a9\u30eb\u30c8\u3067\u306finteractive\u306b\u306a\u3063\u3066\u3044\u305f\u305d\u3046\u3067\u3001\u601d\u3063\u305f\u3088\u308a\u524d\u304b\u3089\u3042\u3063\u305f\u5909\u66f4\u3067\u3057\u305f\u3002","published":"2014-05-06 13:53:38","html":"<iframe src=\"https://hatenablog-parts.com/embed?url=https%3A%2F%2F2k0ri.hatenablog.com%2Fentry%2F2014%2F05%2F06%2F135338\" title=\"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\" class=\"embed-card embed-blogcard\" scrolling=\"no\" frameborder=\"0\" style=\"display: block; width: 100%; height: 190px; max-width: 500px; margin: 10px 0px;\"></iframe>","provider_url":"https://hatena.blog","author_name":"K2ICE","provider_name":"Hatena Blog","blog_title":"\u3057\u305f\u305f\u3081\u306a\u3051\u308c\u3070\u3044\u304d\u306e\u3053\u308c\u306a\u3044","title":"git merge --no-ff\u306f\u60aa\u8005\u3067\u306f\u306a\u304b\u3063\u305f","height":"190"}