{"type":"rich","height":"190","provider_name":"Hatena Blog","version":"1.0","categories":[],"blog_title":"\u897f\u5c3e\u6cf0\u548c\u306e\u306f\u3066\u306a\u30c0\u30a4\u30a2\u30ea\u30fc","author_name":"nishiohirokazu","url":"https://nishiohirokazu.hatenadiary.org/entry/20120616/1339823842","width":"100%","author_url":"https://blog.hatena.ne.jp/nishiohirokazu/","blog_url":"https://nishiohirokazu.hatenadiary.org/","published":"2012-06-16 14:17:22","provider_url":"https://hatena.blog","image_url":null,"html":"<iframe src=\"https://hatenablog-parts.com/embed?url=https%3A%2F%2Fnishiohirokazu.hatenadiary.org%2Fentry%2F20120616%2F1339823842\" title=\"git\u3067merge\u3092undo\u3059\u308b\u306e\u3069\u3046\u3059\u308b\u3093\u3060\u308d\u3046 - \u897f\u5c3e\u6cf0\u548c\u306e\u306f\u3066\u306a\u30c0\u30a4\u30a2\u30ea\u30fc\" class=\"embed-card embed-blogcard\" scrolling=\"no\" frameborder=\"0\" style=\"display: block; width: 100%; height: 190px; max-width: 500px; margin: 10px 0px;\"></iframe>","description":"\u30e6\u30fc\u30b9\u30b1\u30fc\u30b91 \u4f5c\u696d\u3092\u304a\u9858\u3044\u3057\u3066\u3044\u305f\u4eba\u304b\u3089\u30d5\u30a1\u30a4\u30eb\u304c\u30e1\u30fc\u30eb\u3067\u9001\u3089\u308c\u3066\u304f\u308b\u3002\u81ea\u5206\u306e\u307b\u3046\u3067\u9032\u3081\u3066\u305f\u4f5c\u696d\u3092\u4e00\u65e6\u8107\u306b\u3069\u3051\u3066\u304a\u3044\u3066\u3001\u4e8c\u4eba\u304c\u5171\u901a\u306e\u5e95\u672c\u306b\u3057\u3066\u3044\u308b\u30d5\u30a1\u30a4\u30eb\u3092\u3082\u3089\u3063\u305f\u30d5\u30a1\u30a4\u30eb\u3067\u4e0a\u66f8\u304d\u3001\u81ea\u5206\u306e\u4f5c\u696d\u3092\u30de\u30fc\u30b8\u3057\u3088\u3046\u3001\u3068\u3057\u305f\u3089\u304a\u3044\u6587\u5b57\u30b3\u30fc\u30c9\u5909\u3048\u3066\u3093\u3058\u3083\u306d\u3048\u3088\uff01 $ git add foo $ git commit -m \"working\" $ git tag mine $ git reset HEAD^ (\u30d5\u30a1\u30a4\u30eb\u4e0a\u66f8\u304d) $ git merge mine \u2192\u6539\u884c\u30b3\u30fc\u30c9\u304c\u5909\u308f\u3063\u3066\u3044\u3066\u76db\u5927\u306b\u30b3\u30f3\u30d5\u30ea\u30af\u30c8.git/MERGE_HEAD\u3092\u524a\u9664\u3057\u3066\u3001foo\u3092git checkout HEAD^ foo\u3057\u305f\u304c\u3001\u2026","title":"git\u3067merge\u3092undo\u3059\u308b\u306e\u3069\u3046\u3059\u308b\u3093\u3060\u308d\u3046"}