{"html":"<iframe src=\"https://hatenablog-parts.com/embed?url=https%3A%2F%2Fwww.malanka.org%2Fentry%2F2020%2F01%2F19%2F142157\" title=\"\u3010git revert\u3011\u30de\u30fc\u30b8\u6e08\u307f\u306e\u30b3\u30df\u30c3\u30c8\u3092\u53d6\u308a\u6d88\u3057\u3057\u305f\u3044 - \u30b9\u30ea\u98ef\u5c4bMaLanka\u306e\u30d5\u30ea\u30fc\u30a8\u30f3\u30b8\u30cb\u30a2\u306a\u65e5\u3005\" class=\"embed-card embed-blogcard\" scrolling=\"no\" frameborder=\"0\" style=\"display: block; width: 100%; height: 190px; max-width: 500px; margin: 10px 0px;\"></iframe>","author_url":"https://blog.hatena.ne.jp/mah666hhh/","image_url":null,"provider_url":"https://hatena.blog","published":"2020-01-19 14:21:57","url":"https://www.malanka.org/entry/2020/01/19/142157","type":"rich","author_name":"mah666hhh","blog_url":"https://www.malanka.org/","provider_name":"Hatena Blog","title":"\u3010git revert\u3011\u30de\u30fc\u30b8\u6e08\u307f\u306e\u30b3\u30df\u30c3\u30c8\u3092\u53d6\u308a\u6d88\u3057\u3057\u305f\u3044","categories":["\u6280\u8853\u95a2\u9023"],"blog_title":"\u30b9\u30ea\u98ef\u5c4bMaLanka\u306e\u30d5\u30ea\u30fc\u30a8\u30f3\u30b8\u30cb\u30a2\u306a\u65e5\u3005","description":"\u624b\u9806 1\u3001 git log\u306a\u3069\u3067\u3001\u53d6\u308a\u6d88\u3057\u3057\u305f\u3044\u30b3\u30df\u30c3\u30c8No\u3092\u7279\u5b9a\u3059\u308b\u3002 2\u3001 revert\u5b9f\u884c\u3002 $ git revert \u5bfe\u8c61\u306e\u30b3\u30df\u30c3\u30c8No \u4ee5\u4e0b\u306e\u30a8\u30e9\u30fc\u304c\u8fd4\u3063\u3066\u6765\u305f\u3089\u3001 error: commit 16f46cdcdcf2c16136eb501d7d757f28eaeba60f is a merge but no -m option was given. fatal: revert failed -m\u30aa\u30d7\u30b7\u30e7\u30f3\u3068 1 \u3092\u3064\u3051\u3066\u518d\u5ea6\u5b9f\u884c\u3002 $ git revert -m 1 16f46cdcdcf2c16136eb501d7d757f28eaeba60f \u5b9f\u884c\u3067\u304d\u305f\u3089\u30a8\u30c7\u30a3\u30bf\u304c\u958b\u304d\u3001revert\u306e\u30b3\u30df\u30c3\u30c8\u30e1\u30c3\u30bb\u30fc\u30b8\u3092\u5165\u529b\u51fa\u6765\u308b\u306e\u3067\u5165\u529b\u3057\u307e\u3059\u3002 \u5165\u529b\u3057\u305f\u3089 : \u3092\u62bc\u3057\u3066\u3001wq \u3067\u4fdd\u5b58\u7d42\u4e86\u3002 3\u3001 \u5dee\u5206\u3092\u78ba\u8a8d\u3059\u308b\u3002 $ git show \u3067\u3001revert\u3067\u53d6\u308a\u6d88\u3057\u3057\u305f\u5dee\u5206\u304c\u51fa\u308b\u306e\u3067\u78ba\u8a8d\u3059\u308b\u3002 4\u3001 \u554f\u984c\u306a\u3051\u308c\u3070revert\u3057\u305f\u7d50\u679c\u3092\u30b3\u30df\u30c3\u30c8\u3059\u308b\u3002 5\u3001 push\u3059\u308b\u3002 6\u3001 \u30ea\u30e2\u30fc\u30c8\u306b\u53cd\u6620\u3055\u308c\u3066\u3044\u308b\u304b\u3069\u3046\u304b\u78ba\u8a8d\u3057\u3066revert\u7d42\u4e86\u3067\u3059\u3002","height":"190","version":"1.0","width":"100%"}