{"provider_name":"Hatena Blog","description":"[\u8ab2\u984c] fetch\u3057\u3066merge\u3057\u305f\u969b\u306b\u3001\u30b3\u30df\u30c3\u30c8\u304c1\u3064\u5148\u884c\u3057\u3066\u3057\u307e\u3046 git merge \u30aa\u30d7\u30b7\u30e7\u30f3\u306e --ff, --no-ff, --ff-only \u306e\u9055\u3044 https://yu8mada.com/2018/08/15/the-difference-between-the-git-merge-options-ff-no-ff-and-ff-only/ \u30d5\u30a1\u30b9\u30c8\u30d5\u30a9\u30ef\u30fc\u30c9\u30de\u30fc\u30b8\u3068\u306f Git \u306e\u30d5\u30a1\u30b9\u30c8\u30d5\u30a9\u30ef\u30fc\u30c9\u30de\u30fc\u30b8\u3068\u306f, \u30de\u30fc\u30b8\u3055\u308c\u308b\u30d6\u30e9\u30f3\u30c1\u306e HEAD \u3092 \u30de\u30fc\u30b8\u3059\u308b\u30d6\u30e9\u30f3\u30c1\u306e\u5148\u7aef\u306b\u305d\u306e\u307e\u307e\u79fb\u52d5\u3055\u305b\u308b\u30de\u30fc\u30b8\u3092\u6307\u3057\u307e\u3059. \u30d5\u30a1\u30b9\u30c8\u30d5\u30a9\u30ef\u30fc\u30c9\u3068\u3044\u3046\u8a00\u8449\u304c\u30c6\u30fc\u30d7\u3092\u6025\u3044\u3067\u5148\u306b\u9032\u3081\u308b\u3068\u3044\u3046\u610f\u5473\u2026","html":"<iframe src=\"https://hatenablog-parts.com/embed?url=https%3A%2F%2Fnoel-ingenieur.hateblo.jp%2Fentry%2F2020%2F03%2F24%2F135735\" title=\"\u3010git\u3011 git\u306efast-forward\u30aa\u30d7\u30b7\u30e7\u30f3\u306b\u3064\u3044\u3066 - noel-ingenieur\" class=\"embed-card embed-blogcard\" scrolling=\"no\" frameborder=\"0\" style=\"display: block; width: 100%; height: 190px; max-width: 500px; margin: 10px 0px;\"></iframe>","title":"\u3010git\u3011 git\u306efast-forward\u30aa\u30d7\u30b7\u30e7\u30f3\u306b\u3064\u3044\u3066","image_url":null,"version":"1.0","provider_url":"https://hatena.blog","height":"190","categories":["Git"],"type":"rich","url":"https://noel-ingenieur.hateblo.jp/entry/2020/03/24/135735","blog_title":"noel-ingenieur","author_name":"noel-blog","published":"2020-03-24 13:57:35","width":"100%","author_url":"https://blog.hatena.ne.jp/noel-blog/","blog_url":"https://noel-ingenieur.hateblo.jp/"}