{"id":37761,"date":"2023-12-24T04:25:19","date_gmt":"2024-02-27T00:52:03","guid":{"rendered":"https:\/\/www.silicloud.com\/zh\/blog\/git%e6%92%a4%e9%94%80%e9%80%9f%e6%9f%a5%e8%a1%a8\/"},"modified":"2024-05-04T15:07:32","modified_gmt":"2024-05-04T07:07:32","slug":"git%e6%92%a4%e9%94%80%e9%80%9f%e6%9f%a5%e8%a1%a8","status":"publish","type":"post","link":"https:\/\/www.silicloud.com\/zh\/blog\/git%e6%92%a4%e9%94%80%e9%80%9f%e6%9f%a5%e8%a1%a8\/","title":{"rendered":"git\u64a4\u9500\u901f\u67e5\u8868"},"content":{"rendered":"<p>\u4f60\u662f\u5426\u6709\u8fc7\u5728Git\u4e2d\u8bf4\u201c\u72af\u4e86\u4e2a\u9519\u8bef\u3002\u3002\uff08\u4f24\u5fc3\uff09\u201d\u7684\u7ecf\u5386\uff1f\u4e3a\u4e86\u66f4\u5bb9\u6613\u8bb0\u4f4f\uff0c\u4ee5\u4e0b\u662f\u603b\u7ed3\u7684\u65b9\u6cd5\uff08\u7279\u522b\u611f\u8c22@YuneKichi\uff09\u3002<br \/>\n\u5728\u63d0\u4ea4\u4e4b\u524d\u7528git restore<br \/>\n\u5728\u63d0\u4ea4\u4e4b\u540e\u7528git reset<\/p>\n<h2>\u63a8\u524d<\/h2>\n<div>\n<div class=\"post-table\">\u4f55\u3092\u53d6\u308a\u6d88\u3059\uff1f\u30b3\u30de\u30f3\u30c9\u5099\u8003\u30ed\u30fc\u30ab\u30eb\u306e\u5909\u66f4git restore \u30d5\u30a1\u30a4\u30eb\u540d<br \/>\ngit addgit restore -S \u30d5\u30a1\u30a4\u30eb\u540d-S \u306f\u3001&#8211;staged \u306e\u7565\u76f4\u524d\u306egit commit \u2192 staged\u72b6\u614bgit reset &#8211;soft HEAD^<br \/>\n\u76f4\u524d\u306egit commit \u2192 add\u524d\u306e\u72b6\u614bgit reset HEAD^\u30c7\u30d5\u30a9\u3067 &#8211;mixed \u6307\u5b9a\u76f4\u524d\u306e\u30b3\u30df\u30c3\u30c8\u3067\u30ed\u30fc\u30ab\u30eb\u306e\u5909\u66f4\u3082\u53d6\u308a\u6d88\u3057git reset &#8211;hard HEAD^<\/div>\n<\/div>\n<h2>\u63a8\u540e<\/h2>\n<h3>\u64a4\u6d88\u63d0\u4ea4\u800c\u4e0d\u7559\u4e0b\u8bb0\u5f55<\/h3>\n<p>\u5982\u679c\u64a4\u9500\u63d0\u4ea4\uff0c\u7136\u540e\u91cd\u65b0\u63a8\u9001\uff0c\u5c31\u53ef\u4ee5\u4e86\u3002\u4f46\u662f\uff0c\u5728\u5176\u4ed6\u4eba\u4e5f\u4f1a\u63d0\u4ea4\u7684\u73af\u5883\u4e2d\uff0c\u53ef\u80fd\u4f1a\u53d1\u751f\u4e0d\u4e00\u81f4\u7684\u60c5\u51b5\u3002\u8ba9\u6211\u4eec\u8bda\u5b9e\u5730\u62a5\u544a\uff08\u62b1\u6b49\uff09\u3002<\/p>\n<pre class=\"post-pre\"><code>git reset --soft HEAD^\u3000(--\u306e\u6307\u5b9a\u306f\u4e0a\u8a18\u3092\u53c2\u7167)\r\ngit push -f \u30b3\u30df\u30c3\u30c8\u5148\u6307\u5b9a (\u4ee5\u524d\u306e\u30b3\u30df\u30c3\u30c8\u3068\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u3059\u308b\u306e\u3067 -f \u3092\u4ed8\u3051\u308b)\r\n<\/code><\/pre>\n<p>\u5982\u679c\u60f3\u8981\u64a4\u9500\u591a\u4e2a\u63d0\u4ea4\uff0c\u53ea\u9700\u8981\u5728&#8221;HEAD^&#8221;\u540e\u9762\u6307\u5b9a\u6570\u5b57\u3002<br \/>\n\u4f8b\u5b50\uff1aHEAD^3 \u610f\u5473\u7740\u56de\u9000\u52303\u4e2a\u7248\u672c\u4e4b\u524d\uff08\u5373\u64a4\u95002\u4e2a\u63d0\u4ea4\uff09\u3002<\/p>\n<h3>\u5982\u679c\u8981\u4fdd\u7559\u5386\u53f2\u8bb0\u5f55\uff0c\u8bf7\u521b\u5efa\u64a4\u9500\u63d0\u4ea4\u3002<\/h3>\n<pre class=\"post-pre\"><code>git revert HEAD\r\n\uff08\u30b3\u30df\u30c3\u30c8\u30e1\u30c3\u30bb\u30fc\u30b8\u3092\u7de8\u96c6\uff09\r\ngit push \u30b3\u30df\u30c3\u30c8\u5148(\u30ea\u30e2\u30fc\u30c8)\u3092\u6307\u5b9a\r\n<\/code><\/pre>\n","protected":false},"excerpt":{"rendered":"<p>\u4f60\u662f\u5426\u6709\u8fc7\u5728Git\u4e2d\u8bf4\u201c\u72af\u4e86\u4e2a\u9519\u8bef\u3002\u3002\uff08\u4f24\u5fc3\uff09\u201d\u7684\u7ecf\u5386\uff1f\u4e3a\u4e86\u66f4\u5bb9\u6613\u8bb0\u4f4f\uff0c\u4ee5\u4e0b\u662f\u603b\u7ed3\u7684\u65b9\u6cd5\uff08\u7279\u522b\u611f\u8c22@YuneK [&hellip;]<\/p>\n","protected":false},"author":4,"featured_media":0,"comment_status":"closed","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"footnotes":""},"categories":[1],"tags":[],"class_list":["post-37761","post","type-post","status-publish","format-standard","hentry","category-uncategorized"],"yoast_head":"<!-- This site is optimized with the Yoast SEO Premium plugin v21.5 (Yoast SEO v21.5) - https:\/\/yoast.com\/wordpress\/plugins\/seo\/ -->\n<title>git\u64a4\u9500\u901f\u67e5\u8868 - Blog - Silicon Cloud<\/title>\n<meta name=\"robots\" content=\"index, follow, max-snippet:-1, max-image-preview:large, max-video-preview:-1\" \/>\n<link rel=\"canonical\" href=\"https:\/\/www.silicloud.com\/zh\/blog\/git\u64a4\u9500\u901f\u67e5\u8868\/\" \/>\n<meta property=\"og:locale\" content=\"zh_CN\" \/>\n<meta property=\"og:type\" content=\"article\" \/>\n<meta property=\"og:title\" content=\"git\u64a4\u9500\u901f\u67e5\u8868\" \/>\n<meta property=\"og:description\" content=\"\u4f60\u662f\u5426\u6709\u8fc7\u5728Git\u4e2d\u8bf4\u201c\u72af\u4e86\u4e2a\u9519\u8bef\u3002\u3002\uff08\u4f24\u5fc3\uff09\u201d\u7684\u7ecf\u5386\uff1f\u4e3a\u4e86\u66f4\u5bb9\u6613\u8bb0\u4f4f\uff0c\u4ee5\u4e0b\u662f\u603b\u7ed3\u7684\u65b9\u6cd5\uff08\u7279\u522b\u611f\u8c22@YuneK [&hellip;]\" \/>\n<meta property=\"og:url\" content=\"https:\/\/www.silicloud.com\/zh\/blog\/git\u64a4\u9500\u901f\u67e5\u8868\/\" \/>\n<meta property=\"og:site_name\" content=\"Blog - Silicon Cloud\" \/>\n<meta property=\"article:published_time\" content=\"2024-02-27T00:52:03+00:00\" \/>\n<meta property=\"article:modified_time\" content=\"2024-05-04T07:07:32+00:00\" \/>\n<meta name=\"author\" content=\"\u79d1, \u96c5\" \/>\n<meta name=\"twitter:card\" content=\"summary_large_image\" \/>\n<meta name=\"twitter:label1\" content=\"\u4f5c\u8005\" \/>\n\t<meta name=\"twitter:data1\" content=\"\u79d1, \u96c5\" \/>\n<script type=\"application\/ld+json\" class=\"yoast-schema-graph\">{\"@context\":\"https:\/\/schema.org\",\"@graph\":[{\"@type\":\"WebPage\",\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/git%e6%92%a4%e9%94%80%e9%80%9f%e6%9f%a5%e8%a1%a8\/\",\"url\":\"https:\/\/www.silicloud.com\/zh\/blog\/git%e6%92%a4%e9%94%80%e9%80%9f%e6%9f%a5%e8%a1%a8\/\",\"name\":\"git\u64a4\u9500\u901f\u67e5\u8868 - Blog - Silicon Cloud\",\"isPartOf\":{\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/#website\"},\"datePublished\":\"2024-02-27T00:52:03+00:00\",\"dateModified\":\"2024-05-04T07:07:32+00:00\",\"author\":{\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/41e222757cdd2a3365361328bd79970a\"},\"breadcrumb\":{\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/git%e6%92%a4%e9%94%80%e9%80%9f%e6%9f%a5%e8%a1%a8\/#breadcrumb\"},\"inLanguage\":\"zh-Hans\",\"potentialAction\":[{\"@type\":\"ReadAction\",\"target\":[\"https:\/\/www.silicloud.com\/zh\/blog\/git%e6%92%a4%e9%94%80%e9%80%9f%e6%9f%a5%e8%a1%a8\/\"]}]},{\"@type\":\"BreadcrumbList\",\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/git%e6%92%a4%e9%94%80%e9%80%9f%e6%9f%a5%e8%a1%a8\/#breadcrumb\",\"itemListElement\":[{\"@type\":\"ListItem\",\"position\":1,\"name\":\"\u9996\u9875\",\"item\":\"https:\/\/www.silicloud.com\/zh\/blog\/\"},{\"@type\":\"ListItem\",\"position\":2,\"name\":\"git\u64a4\u9500\u901f\u67e5\u8868\"}]},{\"@type\":\"WebSite\",\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/#website\",\"url\":\"https:\/\/www.silicloud.com\/zh\/blog\/\",\"name\":\"Blog - Silicon Cloud\",\"description\":\"\",\"inLanguage\":\"zh-Hans\"},{\"@type\":\"Person\",\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/41e222757cdd2a3365361328bd79970a\",\"name\":\"\u79d1, \u96c5\",\"image\":{\"@type\":\"ImageObject\",\"inLanguage\":\"zh-Hans\",\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/image\/\",\"url\":\"https:\/\/secure.gravatar.com\/avatar\/1b2d3e00a7df03689797ebd4af8c5827ba5af936849a71050ec331f4cf902c5d?s=96&d=mm&r=g\",\"contentUrl\":\"https:\/\/secure.gravatar.com\/avatar\/1b2d3e00a7df03689797ebd4af8c5827ba5af936849a71050ec331f4cf902c5d?s=96&d=mm&r=g\",\"caption\":\"\u79d1, \u96c5\"},\"url\":\"https:\/\/www.silicloud.com\/zh\/blog\/author\/keya\/\"},{\"@type\":\"ImageObject\",\"inLanguage\":\"zh-Hans\",\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/git%e6%92%a4%e9%94%80%e9%80%9f%e6%9f%a5%e8%a1%a8\/#local-main-organization-logo\",\"url\":\"\",\"contentUrl\":\"\",\"caption\":\"Blog - Silicon Cloud\"}]}<\/script>\n<!-- \/ Yoast SEO Premium plugin. -->","yoast_head_json":{"title":"git\u64a4\u9500\u901f\u67e5\u8868 - Blog - Silicon Cloud","robots":{"index":"index","follow":"follow","max-snippet":"max-snippet:-1","max-image-preview":"max-image-preview:large","max-video-preview":"max-video-preview:-1"},"canonical":"https:\/\/www.silicloud.com\/zh\/blog\/git\u64a4\u9500\u901f\u67e5\u8868\/","og_locale":"zh_CN","og_type":"article","og_title":"git\u64a4\u9500\u901f\u67e5\u8868","og_description":"\u4f60\u662f\u5426\u6709\u8fc7\u5728Git\u4e2d\u8bf4\u201c\u72af\u4e86\u4e2a\u9519\u8bef\u3002\u3002\uff08\u4f24\u5fc3\uff09\u201d\u7684\u7ecf\u5386\uff1f\u4e3a\u4e86\u66f4\u5bb9\u6613\u8bb0\u4f4f\uff0c\u4ee5\u4e0b\u662f\u603b\u7ed3\u7684\u65b9\u6cd5\uff08\u7279\u522b\u611f\u8c22@YuneK [&hellip;]","og_url":"https:\/\/www.silicloud.com\/zh\/blog\/git\u64a4\u9500\u901f\u67e5\u8868\/","og_site_name":"Blog - Silicon Cloud","article_published_time":"2024-02-27T00:52:03+00:00","article_modified_time":"2024-05-04T07:07:32+00:00","author":"\u79d1, \u96c5","twitter_card":"summary_large_image","twitter_misc":{"\u4f5c\u8005":"\u79d1, \u96c5"},"schema":{"@context":"https:\/\/schema.org","@graph":[{"@type":"WebPage","@id":"https:\/\/www.silicloud.com\/zh\/blog\/git%e6%92%a4%e9%94%80%e9%80%9f%e6%9f%a5%e8%a1%a8\/","url":"https:\/\/www.silicloud.com\/zh\/blog\/git%e6%92%a4%e9%94%80%e9%80%9f%e6%9f%a5%e8%a1%a8\/","name":"git\u64a4\u9500\u901f\u67e5\u8868 - Blog - Silicon Cloud","isPartOf":{"@id":"https:\/\/www.silicloud.com\/zh\/blog\/#website"},"datePublished":"2024-02-27T00:52:03+00:00","dateModified":"2024-05-04T07:07:32+00:00","author":{"@id":"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/41e222757cdd2a3365361328bd79970a"},"breadcrumb":{"@id":"https:\/\/www.silicloud.com\/zh\/blog\/git%e6%92%a4%e9%94%80%e9%80%9f%e6%9f%a5%e8%a1%a8\/#breadcrumb"},"inLanguage":"zh-Hans","potentialAction":[{"@type":"ReadAction","target":["https:\/\/www.silicloud.com\/zh\/blog\/git%e6%92%a4%e9%94%80%e9%80%9f%e6%9f%a5%e8%a1%a8\/"]}]},{"@type":"BreadcrumbList","@id":"https:\/\/www.silicloud.com\/zh\/blog\/git%e6%92%a4%e9%94%80%e9%80%9f%e6%9f%a5%e8%a1%a8\/#breadcrumb","itemListElement":[{"@type":"ListItem","position":1,"name":"\u9996\u9875","item":"https:\/\/www.silicloud.com\/zh\/blog\/"},{"@type":"ListItem","position":2,"name":"git\u64a4\u9500\u901f\u67e5\u8868"}]},{"@type":"WebSite","@id":"https:\/\/www.silicloud.com\/zh\/blog\/#website","url":"https:\/\/www.silicloud.com\/zh\/blog\/","name":"Blog - Silicon Cloud","description":"","inLanguage":"zh-Hans"},{"@type":"Person","@id":"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/41e222757cdd2a3365361328bd79970a","name":"\u79d1, \u96c5","image":{"@type":"ImageObject","inLanguage":"zh-Hans","@id":"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/image\/","url":"https:\/\/secure.gravatar.com\/avatar\/1b2d3e00a7df03689797ebd4af8c5827ba5af936849a71050ec331f4cf902c5d?s=96&d=mm&r=g","contentUrl":"https:\/\/secure.gravatar.com\/avatar\/1b2d3e00a7df03689797ebd4af8c5827ba5af936849a71050ec331f4cf902c5d?s=96&d=mm&r=g","caption":"\u79d1, \u96c5"},"url":"https:\/\/www.silicloud.com\/zh\/blog\/author\/keya\/"},{"@type":"ImageObject","inLanguage":"zh-Hans","@id":"https:\/\/www.silicloud.com\/zh\/blog\/git%e6%92%a4%e9%94%80%e9%80%9f%e6%9f%a5%e8%a1%a8\/#local-main-organization-logo","url":"","contentUrl":"","caption":"Blog - Silicon Cloud"}]}},"_links":{"self":[{"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/posts\/37761","targetHints":{"allow":["GET"]}}],"collection":[{"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/users\/4"}],"replies":[{"embeddable":true,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/comments?post=37761"}],"version-history":[{"count":2,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/posts\/37761\/revisions"}],"predecessor-version":[{"id":99048,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/posts\/37761\/revisions\/99048"}],"wp:attachment":[{"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/media?parent=37761"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/categories?post=37761"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/tags?post=37761"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}