{"id":5758,"date":"2022-11-11T08:18:32","date_gmt":"2022-11-10T23:18:32","guid":{"rendered":"https:\/\/www.chihayafuru.jp\/tech\/?p=5758"},"modified":"2023-11-24T13:27:10","modified_gmt":"2023-11-24T04:27:10","slug":"git-reset","status":"publish","type":"post","link":"https:\/\/www.chihayafuru.jp\/tech\/index.php\/archives\/5758","title":{"rendered":"[git] reset"},"content":{"rendered":"<p><img decoding=\"async\" src=\"https:\/\/chihayafuru.s3-ap-northeast-1.amazonaws.com\/imgs\/wp\/2022\/11\/git_reset_options.png\" alt=\"options of git reset\"><br \/>\n<!--more--><\/p>\n<h3><code>--soft<\/code><\/h3>\n<ol>\n<li>HEAD: commit\u3092<font color=\"red\">\u7834\u68c4\u3059\u308b<\/font> \uff08\u30b3\u30df\u30c3\u30c8\u524d\u306b\u623b\u3059 \u203b1\uff09<\/li>\n<li>index: add\u3092<font color=\"green\">\u7834\u68c4\u3057\u306a\u3044<\/font> \uff08reset\u30b3\u30de\u30f3\u30c9\u5b9f\u884c\u524d\u306e\u307e\u307e\uff09<\/li>\n<li>worktree: \u7de8\u96c6\u3092<font color=\"green\">\u7834\u68c4\u3057\u306a\u3044<\/font>\uff08reset\u30b3\u30de\u30f3\u30c9\u5b9f\u884c\u524d\u306e\u307e\u307e\uff09<\/li>\n<\/ol>\n<h3><code>--mixed (default)<\/code><\/h3>\n<ol>\n<li>HEAD: commit\u3092<font color=\"red\">\u7834\u68c4\u3059\u308b<\/font> \uff08\u30b3\u30df\u30c3\u30c8\u524d\u306b\u623b\u3059 \u203b1\uff09<\/li>\n<li>index: add\u3092<font color=\"red\">\u7834\u68c4\u3059\u308b<\/font> \uff08add\u524d\u306b\u623b\u3059 \u203b2\uff09<\/li>\n<li>worktree: \u7de8\u96c6\u3092<font color=\"green\">\u7834\u68c4\u3057\u306a\u3044<\/font> \uff08reset\u30b3\u30de\u30f3\u30c9\u5b9f\u884c\u524d\u306e\u307e\u307e\uff09<\/li>\n<\/ol>\n<h3><code>--hard<\/code><\/h3>\n<ol>\n<li>HEAD: commit\u3092<font color=\"red\">\u7834\u68c4\u3059\u308b<\/font> \uff08\u30b3\u30df\u30c3\u30c8\u524d\u306b\u623b\u3059 \u203b1\uff09<\/li>\n<li>index: add\u3092<font color=\"red\">\u7834\u68c4\u3059\u308b<\/font> \uff08add\u524d\u306b\u623b\u3059 \u203b2\uff09<\/li>\n<li>worktree: \u7de8\u96c6\u3092<font color=\"red\">\u7834\u68c4\u3059\u308b<\/font> \uff08\u7de8\u96c6\u524d\u306b\u623b\u3059 \u203b3\uff09<\/li>\n<\/ol>\n<p>\u203b1: \u3053\u3053\u3067\u3044\u3046\u300c\u623b\u3059\u300d\u3068\u306f (revert \u30b3\u30de\u30f3\u30c9\u306b\u3088\u308b)\u5c65\u6b74\u3092\u6b8b\u3059\u5f8c\u623b\u308a\u3067\u306f\u306a\u304f\u3001\u30b3\u30df\u30c3\u30c8\u3092\u306a\u304b\u3063\u305f\u3053\u3068\u306b\u3059\u308b\u3053\u3068\u3002<\/p>\n<p>\u203b2: add\u30b3\u30de\u30f3\u30c9\u306b\u3088\u308b\u30b9\u30c6\u30fc\u30b8\u30f3\u30b0\u3092\u306a\u304b\u3063\u305f\u3053\u3068\u306b\u3059\u308b\u3053\u3068\u3002\u30b9\u30c6\u30fc\u30b8\u30f3\u30b0\u3092HEAD\u3068\u540c\u3058\u306b\u3059\u308b\u3053\u3068\u3002&quot;<code>git restore --staged<\/code>&quot; \u3068\u540c\u7b49\u3002<\/p>\n<p>\u203b3: \u7de8\u96c6\u3092\u306a\u304b\u3063\u305f\u3053\u3068\u306b\u3059\u308b\u3002\u30ef\u30fc\u30af\u3092checkout\u76f4\u5f8c\u306b\u623b\u3059\u3053\u3068\u3002&quot;<code>git restore<\/code>&quot; \u3068\u540c\u7b49\u3002<\/p>\n<p>&nbsp;<\/p>\n<h3>git reset \u306e\u30b3\u30de\u30f3\u30c9\u4f8b<\/h3>\n<pre class=\"lang:sh decode:true \" >$ git reset --hard HEAD^<\/pre>\n<ul>\n<li>\u30ea\u30dd\u30b8\u30c8\u30ea\u306e HEAD \u306e\u30b3\u30df\u30c3\u30c8\u3092\u7834\u68c4\u3059\u308b\u3002<\/li>\n<li>\u30b9\u30c6\u30fc\u30b8\u30f3\u30b0(git add\u3057\u305f\u5909\u66f4)\u3092\u7834\u68c4\u3059\u308b\u3002<\/li>\n<li>\u30ef\u30fc\u30af\u30c4\u30ea\u30fc\u306e\u7de8\u96c6\uff08\u5909\u66f4\uff09\u3092\u7834\u68c4\u3059\u308b\u3002<\/li>\n<\/ul>\n<p>\u203b \u30de\u30fc\u30b8\u30b3\u30df\u30c3\u30c8\u3092\u30ea\u30bb\u30c3\u30c8\u3059\u308b\u30b1\u30fc\u30b9\u3067\u306f\u3001\u3069\u3061\u3089\u306e\u30b3\u30df\u30c3\u30c8\u306b\u623b\u3059\u304b\u610f\u8b58\u3059\u308b\u305f\u3081\u306b <code>^<\/code> (\u30ad\u30e3\u30ec\u30c3\u30c8) \u3067\u6307\u5b9a\u3059\u308b\u3053\u3068\u3092\u63a8\u5968\u3059\u308b\u3002<\/p>\n<p>&nbsp;<\/p>\n<h3>\u95a2\u9023\u30ea\u30f3\u30af<\/h3>\n<ul>\n<li><a href=\"\/tech\/index.php\/archives\/3959\">git rm \u306e\u53d6\u308a\u6d88\u3057<\/a><\/li>\n<li><a href=\"\/tech\/index.php\/archives\/2945\">git add \u306e\u53d6\u308a\u6d88\u3057<\/a><\/li>\n<li><a href=\"\/tech\/index.php\/archives\/2535\">[git] \u30c1\u30eb\u30c0(~)\u3068\u30ad\u30e3\u30ec\u30c3\u30c8(^)\u306e\u9055\u3044<\/a><\/li>\n<\/ul>\n","protected":false},"excerpt":{"rendered":"","protected":false},"author":1,"featured_media":0,"comment_status":"closed","ping_status":"closed","sticky":false,"template":"","format":"standard","meta":{"footnotes":""},"categories":[3],"tags":[2],"class_list":["post-5758","post","type-post","status-publish","format-standard","hentry","category-memo","tag-git"],"_links":{"self":[{"href":"https:\/\/www.chihayafuru.jp\/tech\/index.php\/wp-json\/wp\/v2\/posts\/5758","targetHints":{"allow":["GET"]}}],"collection":[{"href":"https:\/\/www.chihayafuru.jp\/tech\/index.php\/wp-json\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/www.chihayafuru.jp\/tech\/index.php\/wp-json\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/www.chihayafuru.jp\/tech\/index.php\/wp-json\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"https:\/\/www.chihayafuru.jp\/tech\/index.php\/wp-json\/wp\/v2\/comments?post=5758"}],"version-history":[{"count":22,"href":"https:\/\/www.chihayafuru.jp\/tech\/index.php\/wp-json\/wp\/v2\/posts\/5758\/revisions"}],"predecessor-version":[{"id":6518,"href":"https:\/\/www.chihayafuru.jp\/tech\/index.php\/wp-json\/wp\/v2\/posts\/5758\/revisions\/6518"}],"wp:attachment":[{"href":"https:\/\/www.chihayafuru.jp\/tech\/index.php\/wp-json\/wp\/v2\/media?parent=5758"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/www.chihayafuru.jp\/tech\/index.php\/wp-json\/wp\/v2\/categories?post=5758"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/www.chihayafuru.jp\/tech\/index.php\/wp-json\/wp\/v2\/tags?post=5758"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}