{"type":"rich","width":"100%","author_url":"https://blog.hatena.ne.jp/gom68/","author_name":"gom68","version":"1.0","url":"https://gom.hatenablog.com/entry/20090412/1239505125","title":"\u3084\u3063\u3066\u3057\u307e\u3063\u305f\u3053\u3068\u3092\u306a\u304b\u3063\u305f\u3053\u3068\u306b\u3057\u305f\u3044","image_url":null,"blog_title":"gom68\u306e\u65e5\u8a18","provider_name":"Hatena Blog","height":"190","published":"2009-04-12 11:58:45","categories":["git"],"html":"<iframe src=\"https://hatenablog-parts.com/embed?url=https%3A%2F%2Fgom.hatenablog.com%2Fentry%2F20090412%2F1239505125\" title=\"\u3084\u3063\u3066\u3057\u307e\u3063\u305f\u3053\u3068\u3092\u306a\u304b\u3063\u305f\u3053\u3068\u306b\u3057\u305f\u3044 - gom68\u306e\u65e5\u8a18\" 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","blog_url":"https://gom.hatenablog.com/","description":"\u4eba\u751f\u306freset\u3084revert\u3067\u304d\u306a\u3044\u3051\u3069\u3001git\u306a\u30891\u884c\u3067\u3067\u304d\u308b\u3088\uff01 \u8272\u3005\u65b9\u6cd5\u304c\u3042\u308b\u3088\u3046\u306a\u306e\u3067\u30e1\u30e2\u3002\u3054\u3061\u3083\u3054\u3061\u3083\u3068\u3084\u3063\u3066\u307f\u305f\u3051\u3069\u30c0\u30e1\u3067\u3057\u305f\u30fc\uff01\u623b\u3057\u305f\u3044\uff01\u3067\u3082\u624b\u52d5\u3058\u3083\u7121\u7406\uff01\u307f\u305f\u3044\u306a\u6642\u306b\u4f7f\u3044\u307e\u3057\u3087\u3046\u3002 \u30d5\u30a1\u30a4\u30eb\u306f\u305d\u306e\u307e\u307e\u306b\u3001\u30b3\u30df\u30c3\u30c8\u8a18\u9332\u3060\u3051\u6d88\u3059 hash \u306e\u30b3\u30df\u30c3\u30c8\u307e\u3067\u623b\u3059\u3002\u30d5\u30a1\u30a4\u30eb\u306f\u73fe\u5728\u306e\u307e\u307e\u7dad\u6301\u3002 $git reset --soft \u7ba1\u7406\u4e0b\u306e\u30d5\u30a1\u30a4\u30eb\u3092\u6307\u5b9a\u3057\u305f\u30b3\u30df\u30c3\u30c8\u307e\u3067\u623b\u3059 \u30d5\u30a1\u30a4\u30eb\u306e\u72b6\u614b\u3092\u4ee5\u524d\u306e\u30b3\u30df\u30c3\u30c8\u306e\u72b6\u614b\u306b\u623b\u3059\u3002 \u5909\u66f4\u3092\u5143\u306b\u623b\u3057\u305f\u3044\u6642\u3002\u672a\u30b3\u30df\u30c3\u30c8\u3067\u3082add\u3055\u308c\u3066\u3044\u308b\u30d5\u30a1\u30a4\u30eb\u306f\u7ba1\u7406\u4e0b\u3068\u898b\u306a\u3055\u308c\u3066\u6d88\u3055\u308c\u308b\u306e\u3067\u6ce8\u610f\u3002 $git reset --hard \u4ed6\u306e\u4eba\u304cmerge\u3057\u3061\u3083\u3063\u305f\u3082\u306e\u3092\u306a\u2026"}