{"height":"190","categories":["Git"],"provider_url":"https://hatena.blog","type":"rich","author_name":"arcright","html":"<iframe src=\"https://hatenablog-parts.com/embed?url=https%3A%2F%2Fchulip.org%2Fentry%2F20111020%2F1319116832\" title=\"git reset\u3092\u53d6\u308a\u6d88\u3059 - chulip.org\" 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,"published":"2011-10-20 22:20:32","author_url":"https://blog.hatena.ne.jp/arcright/","title":"git reset\u3092\u53d6\u308a\u6d88\u3059","blog_title":"chulip.org","url":"https://chulip.org/entry/20111020/1319116832","description":"commit\u3092\u53d6\u308a\u6d88\u3057\u305f\u3044\u6642\u306breset\u3092\u4f7f\u3046\u3053\u3068\u304c\u3042\u308b\u3051\u3069\u3001\u305d\u306ereset\u3092\u53d6\u308a\u6d88\u3057\u305f\u3044 # \u5b9f\u306fORIG_HEAD\u306b\u306f\u6b8b\u3063\u3066\u3044\u3066\u307f\u308c\u305f\u308a\u3059\u308b $ git show ORIG_HEAD # \u5dee\u5206\u3082\u3068\u308c\u305f\u308a\u3059\u308b $ git diff ORIG_HEAD # \u305d\u306e\u6642\u306e\u30e1\u30c3\u30bb\u30fc\u30b8\u3092\u4f7f\u3063\u3066\u30b3\u30df\u30c3\u30c8\u3068\u304b\u3082\u3067\u304d\u308b # -C\u306f\u30e1\u30c3\u30bb\u30fc\u30b8\u305d\u306e\u307e\u307e\u3001-c\u306f\u7de8\u96c6\u3067\u304d\u308b # unstage\u72b6\u614b\u306b\u306a\u3063\u3066\u308b\u306f\u305a\u306a\u306e\u3067add\u3059\u308b\u304bcommit -a $ git commit -C -a ORIG_HEAD \u53c2\u8003\u30b5\u30a4\u30c8 http://sourceforge.jp/magazine/09/03/16/0831212/3 h\u2026","provider_name":"Hatena Blog","width":"100%","version":"1.0","blog_url":"https://chulip.org/"}