{"id":3185,"date":"2025-10-29T17:52:26","date_gmt":"2025-10-29T08:52:26","guid":{"rendered":"https:\/\/www.blowfish.co.jp\/?p=3185"},"modified":"2025-10-29T17:52:26","modified_gmt":"2025-10-29T08:52:26","slug":"git-%e3%81%ae-discard-change-%e3%81%ab%e3%81%a4%e3%81%84%e3%81%a6","status":"publish","type":"post","link":"https:\/\/www.blowfish.co.jp\/?p=3185","title":{"rendered":"Git \u306e discard change \u306b\u3064\u3044\u3066"},"content":{"rendered":"\n<p>Git \u306e &#8220;discard changes&#8221; \u306f\u3001<strong>\u4f5c\u696d\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u5185\u306e\u5909\u66f4\u3092\u7834\u68c4\u3057\u3066\u3001\u6700\u5f8c\u306b\u30b3\u30df\u30c3\u30c8\u3057\u305f\u72b6\u614b\u306b\u623b\u3059<\/strong>\u51e6\u7406\u3067\u3059\u3002<\/p>\n\n\n\n<h2 class=\"wp-block-heading\">\u5177\u4f53\u7684\u306a\u51e6\u7406\u5185\u5bb9<\/h2>\n\n\n\n<h3 class=\"wp-block-heading\">1. <strong>\u5909\u66f4\u3055\u308c\u305f\u30d5\u30a1\u30a4\u30eb\u306e\u5834\u5408<\/strong><\/h3>\n\n\n\n<ul class=\"wp-block-list\">\n<li>\u7de8\u96c6\u3057\u305f\u5185\u5bb9\u304c\u524a\u9664\u3055\u308c\u3001HEAD\uff08\u6700\u65b0\u306e\u30b3\u30df\u30c3\u30c8\uff09\u306e\u72b6\u614b\u306b\u623b\u308a\u307e\u3059<\/li>\n\n\n\n<li><code>git restore &lt;\u30d5\u30a1\u30a4\u30eb\u540d><\/code> \u307e\u305f\u306f <code>git checkout -- &lt;\u30d5\u30a1\u30a4\u30eb\u540d><\/code> \u3068\u540c\u7b49\u306e\u51e6\u7406<\/li>\n<\/ul>\n\n\n\n<h3 class=\"wp-block-heading\">2. <strong>\u65b0\u898f\u4f5c\u6210\u3057\u305f\u30d5\u30a1\u30a4\u30eb\u306e\u5834\u5408<\/strong><\/h3>\n\n\n\n<ul class=\"wp-block-list\">\n<li>\u8ffd\u8de1\u3055\u308c\u3066\u3044\u306a\u3044\uff08untracked\uff09\u30d5\u30a1\u30a4\u30eb\u306f\u3001\u901a\u5e38\u306e discard \u3067\u306f\u524a\u9664\u3055\u308c\u307e\u305b\u3093<\/li>\n\n\n\n<li><code>git clean<\/code> \u30b3\u30de\u30f3\u30c9\u3092\u4f7f\u3046\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059<\/li>\n<\/ul>\n\n\n\n<h3 class=\"wp-block-heading\">3. <strong>\u30b9\u30c6\u30fc\u30b8\u30f3\u30b0\u30a8\u30ea\u30a2\u306e\u5909\u66f4<\/strong><\/h3>\n\n\n\n<ul class=\"wp-block-list\">\n<li><code>git add<\/code> \u3067\u30b9\u30c6\u30fc\u30b8\u30f3\u30b0\u3057\u305f\u5909\u66f4\u3082\u7834\u68c4\u3067\u304d\u307e\u3059<\/li>\n\n\n\n<li><code>git restore --staged &lt;\u30d5\u30a1\u30a4\u30eb\u540d><\/code> \u3067\u30b9\u30c6\u30fc\u30b8\u30f3\u30b0\u3092\u89e3\u9664\u3057\u3066\u304b\u3089\u3001\u4f5c\u696d\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u306e\u5909\u66f4\u3092\u7834\u68c4\u3057\u307e\u3059<\/li>\n<\/ul>\n\n\n\n<h2 class=\"wp-block-heading\">\u6ce8\u610f\u70b9<\/h2>\n\n\n\n<p>\u26a0\ufe0f <strong>\u3053\u306e\u64cd\u4f5c\u306f\u5143\u306b\u623b\u305b\u307e\u305b\u3093<\/strong><\/p>\n\n\n\n<ul class=\"wp-block-list\">\n<li>\u30ed\u30fc\u30ab\u30eb\u306e\u5909\u66f4\u306f\u5b8c\u5168\u306b\u5931\u308f\u308c\u307e\u3059<\/li>\n\n\n\n<li>\u30b3\u30df\u30c3\u30c8\u3057\u3066\u3044\u306a\u3044\u4f5c\u696d\u306f\u5fa9\u5143\u3067\u304d\u306a\u304f\u306a\u308a\u307e\u3059<\/li>\n<\/ul>\n\n\n\n<h2 class=\"wp-block-heading\">\u5b9f\u884c\u4f8b<\/h2>\n\n\n\n<pre class=\"wp-block-code\"><code># \u7279\u5b9a\u306e\u30d5\u30a1\u30a4\u30eb\u306e\u5909\u66f4\u3092\u7834\u68c4\ngit restore example.txt\n\n# \u3059\u3079\u3066\u306e\u5909\u66f4\u3092\u7834\u68f2\ngit restore .\n\n# \u30b9\u30c6\u30fc\u30b8\u30f3\u30b0\u3057\u305f\u5909\u66f4\u3082\u542b\u3081\u3066\u7834\u68c4\ngit restore --staged --worktree example.txt\n<\/code><\/pre>\n\n\n\n<p>\u591a\u304f\u306eGUI\u30c4\u30fc\u30eb\uff08VS Code\u3001GitHub Desktop \u306a\u3069\uff09\u3067\u306f\u3001\u300cDiscard Changes\u300d\u30dc\u30bf\u30f3\u3092\u62bc\u3059\u3068\u3053\u308c\u3089\u306e\u30b3\u30de\u30f3\u30c9\u304c\u5185\u90e8\u3067\u5b9f\u884c\u3055\u308c\u307e\u3059\u3002<\/p>\n","protected":false},"excerpt":{"rendered":"<p>Git \u306e &#8220;discard changes&#8221; \u306f\u3001\u4f5c\u696d\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u5185\u306e\u5909\u66f4\u3092\u7834\u68c4\u3057\u3066\u3001\u6700\u5f8c\u306b\u30b3\u30df\u30c3\u30c8\u3057\u305f\u72b6\u614b\u306b\u623b\u3059\u51e6\u7406\u3067\u3059\u3002 \u5177\u4f53\u7684\u306a\u51e6\u7406\u5185\u5bb9 1. \u5909\u66f4\u3055\u308c\u305f\u30d5\u30a1\u30a4\u30eb\u306e\u5834\u5408 2. \u65b0\u898f\u4f5c\u6210\u3057\u305f [&hellip;]<\/p>\n","protected":false},"author":1,"featured_media":0,"comment_status":"open","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"saved_in_kubio":false,"footnotes":""},"categories":[24,4],"tags":[],"class_list":["post-3185","post","type-post","status-publish","format-standard","hentry","category-git","category-tech"],"_links":{"self":[{"href":"https:\/\/www.blowfish.co.jp\/index.php?rest_route=\/wp\/v2\/posts\/3185","targetHints":{"allow":["GET"]}}],"collection":[{"href":"https:\/\/www.blowfish.co.jp\/index.php?rest_route=\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/www.blowfish.co.jp\/index.php?rest_route=\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/www.blowfish.co.jp\/index.php?rest_route=\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"https:\/\/www.blowfish.co.jp\/index.php?rest_route=%2Fwp%2Fv2%2Fcomments&post=3185"}],"version-history":[{"count":1,"href":"https:\/\/www.blowfish.co.jp\/index.php?rest_route=\/wp\/v2\/posts\/3185\/revisions"}],"predecessor-version":[{"id":3186,"href":"https:\/\/www.blowfish.co.jp\/index.php?rest_route=\/wp\/v2\/posts\/3185\/revisions\/3186"}],"wp:attachment":[{"href":"https:\/\/www.blowfish.co.jp\/index.php?rest_route=%2Fwp%2Fv2%2Fmedia&parent=3185"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/www.blowfish.co.jp\/index.php?rest_route=%2Fwp%2Fv2%2Fcategories&post=3185"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/www.blowfish.co.jp\/index.php?rest_route=%2Fwp%2Fv2%2Ftags&post=3185"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}