{"author_name":"i178inaba","blog_title":"Technology Engineering","width":"100%","provider_url":"https://hatena.blog","published":"2017-01-09 22:38:10","author_url":"https://blog.hatena.ne.jp/i178inaba/","title":"git merge\u306e\u3068\u304d\u3001\u30c7\u30d5\u30a9\u30eb\u30c8\u3067no-ff\u306b\u306a\u308b\u3088\u3046\u306b\u3059\u308b\u8a2d\u5b9a","url":"https://inaba.hatenablog.com/entry/2017/01/09/223810","provider_name":"Hatena Blog","description":"inaba\u3067\u3059\u3002 \u30d6\u30e9\u30f3\u30c1\u306e\u30de\u30fc\u30b8\u6642\u306b\u30de\u30fc\u30b8\u5bfe\u8c61\u306e\u30d6\u30e9\u30f3\u30c1\u3067\u3069\u3093\u306a\u5909\u66f4\u304c\u3042\u3063\u305f\u304b\u77e5\u308b\u305f\u3081\u306b\u30de\u30fc\u30b8\u30b3\u30df\u30c3\u30c8\u304c\u6b32\u3057\u3044\u306e\u3067--no-ff(No Fast-forward)\u30aa\u30d7\u30b7\u30e7\u30f3\u3092\u3064\u3051\u3066\u3044\u307e\u3057\u305f\u3002 $ git merge --no-ff foobar \u3067\u3059\u304c\u3001\u8a2d\u5b9a\u3067\u30c7\u30d5\u30a9\u30eb\u30c8\u3092no-ff\u306b\u3067\u304d\u308b\u3053\u3068\u3092\u77e5\u308a\u307e\u3057\u305f\u3002 \u8a2d\u5b9a $ git config --global merge.ff false \u4e0a\u8a18\u8a2d\u5b9a\u3092\u3059\u308b\u3053\u3068\u3067git merge foobar\u306e\u307f\u3067no-ff\u306e\u30de\u30fc\u30b8\u306b\u306a\u308a\u307e\u3059\u3002 $ git merge foobar ... $ git log --graph --oneline * f84d52\u2026","blog_url":"https://inaba.hatenablog.com/","height":"190","categories":[],"html":"<iframe src=\"https://hatenablog-parts.com/embed?url=https%3A%2F%2Finaba.hatenablog.com%2Fentry%2F2017%2F01%2F09%2F223810\" title=\"git merge\u306e\u3068\u304d\u3001\u30c7\u30d5\u30a9\u30eb\u30c8\u3067no-ff\u306b\u306a\u308b\u3088\u3046\u306b\u3059\u308b\u8a2d\u5b9a - Technology Engineering\" class=\"embed-card embed-blogcard\" scrolling=\"no\" frameborder=\"0\" style=\"display: block; width: 100%; height: 190px; max-width: 500px; margin: 10px 0px;\"></iframe>","image_url":null,"version":"1.0","type":"rich"}