{"id":927,"date":"2019-10-07T10:13:05","date_gmt":"2019-10-07T02:13:05","guid":{"rendered":"https:\/\/jqnets.com\/blog\/?p=927"},"modified":"2019-10-07T10:17:37","modified_gmt":"2019-10-07T02:17:37","slug":"git-%e5%ad%b8%e7%bf%92%e6%89%8b%e5%86%8a6-%e6%92%a4%e9%8a%b7%e6%8f%90%e4%ba%a4%ef%bc%9agit-reset-for-rollback","status":"publish","type":"post","link":"https:\/\/jqnets.com\/blog\/git-%e5%ad%b8%e7%bf%92%e6%89%8b%e5%86%8a6-%e6%92%a4%e9%8a%b7%e6%8f%90%e4%ba%a4%ef%bc%9agit-reset-for-rollback\/","title":{"rendered":"Git \u5b78\u7fd2\u624b\u518a#6 \u64a4\u92b7\u63d0\u4ea4\uff1aGit Reset for Rollback"},"content":{"rendered":"

\u4eca\u5929\u6211\u5011\u4f86\u5b78\u7fd2 Rollback\uff0c\u7576\u6211\u5011\u5728\u4f7f\u7528 Git Commit \u6307\u4ee4\u7684\u6642\u5019\uff0c\u6709\u53ef\u80fd\u300c\u767c\u73fe\u4e00\u4e9b\u932f\u8aa4\u300d\u6216\u300c\u5f8c\u6094\u4e86\u300d\uff0c\u60f3\u8981\u64a4\u56de\uff0c\u5c31\u53ef\u4ee5\u4f7f\u7528 Git Reset \u9019\u4e00\u500b\u6307\u4ee4\uff0c\u4f46\u9019\u4e00\u500b\u6307\u4ee4\u5f88\u591a\u4eba\u5e38\u5e38\u641e\u4e0d\u6e05\u695a\u53c3\u6578 hard \/ soft \/ mixed \u7684\u5dee\u7570\uff0c\u4ee5\u4e0b\uff0c\u6211\u5011\u4e00\u6a23\u900f\u904e\u5be6\u4f5c\u7df4\u7fd2\u7684\u65b9\u5f0f\u4f86\u5b78\u7fd2\u9019\u4e09\u500b\u53c3\u6578\u7684\u5dee\u7570\u3002<\/p>\n

 <\/p>\n

 <\/p>\n

\u25a0\u00a0git reset ( hard \/ soft )<\/strong><\/span><\/p>\n

 <\/p>\n

\u5982\u679c\u6211\u5011 Commit \u4e4b\u5f8c\uff0c\u6211\u5011\u53ef\u4ee5\u900f\u904e git log \u53bb\u67e5\u8a62 Commit \u8a18\u9304\uff0c\u5176\u4e2d\u6700\u65b0\u7684\u90a3\u4e00\u7b46\u6703\u51fa\u73fe\u301d HEAD -> master<\/span>\u301e\u7684\u5b57\u773c\uff0c\u5982\u4e0b\u5716\u6240\u793a\uff1a<\/p>\n

 <\/p>\n

\"\"<\/p>\n

 <\/p>\n

HEAD -> master \u662f\u7576\u524d\u6700\u65b0\u7684\u4e00\u500b Commit<\/p>\n

\u200c<\/p>\n

\u5047\u8a2d\u6211\u5011\u53c8\u65b0\u589e commit \u4e86 demo.txt \uff0c\u5982\u4e0b\u5716\u6240\u793a\uff1a<\/p>\n

\"\"<\/p>\n

 <\/p>\n

\u200c<\/p>\n

\u96d6\u7136\u6211\u5011\u53ef\u4ee5\u900f\u904e git diff \u6307\u4ee4\u53bb\u770b\u6211\u5011\u8b8a\u66f4\u4e86\u54ea\u4e9b\u5167\u5bb9\uff0c\u4e00\u884c\u4e00\u884c\u53bb\u522a\uff0c\u4f46\u9019\u500b\u4e0d\u592a\u53ef\u884c\uff0c\u6240\u4ee5\u53ef\u4ee5\u900f\u904e git reset –hard HEAD~<\/span> \u6307\u4ee4\u53bb\u9032\u884c\u64a4\u92b7\u63d0\u4ea4\u3002<\/p>\n

git reset --hard HEAD~<\/pre>\n
 <\/p>\n
 <\/p>\n
\"\"<\/p>\n
 <\/p>\n
\u200c\u9019\u6642\u5019\u6211\u5011\u518d\u4f7f\u7528 git log \u53bb\u67e5\u770b\uff0c\u767c\u73fe demo commit \u5df2\u7d93\u4e0d\u898b\u4e86\uff0c\u800c\u6a94\u6848\u4e5f\u5df2\u7d93\u9084\u539f\u56de\u4f86<\/p>\n
 <\/p>\n
 <\/p>\n
\"\"<\/p>\n
\u525b\u6211\u5011\u7528\u7684\u6307\u4ee4\u662f git reset –hard HEAD~<\/span> \uff0c\u5982\u679c\u6211\u5011\u6539\u7528 soft \u53c3\u6578\uff1a git reset –soft HEAD~<\/span> \uff0c\u90a3\u9ebc\u64a4\u6d88\u4e00\u6a23\u6703\u6210\u7acb\uff0c\u4f46\u6a94\u6848\u301d\u4e0d\u6703\u88ab\u9084\u539f\u301e\uff0c\u56de\u5230\u63d0\u4ea4\u524d\u7684\u72c0\u614b ( uncommit )\u3002<\/p>\n
git reset\u00a0\u00a0--softs\u00a0HEAD~<\/pre>\n
 <\/p>\n
\u5982\u679c\u6211\u5011\u4f7f\u7528 git reset HEAD ~ \uff0c\u4f46\u4e0d\u52a0\u53c3\u6578\uff0c\u90a3\u9ebc\u90a3\u9ebc\u64a4\u6d88\u4e00\u6a23\u6703\u6210\u7acb\uff0c\u4f46\u6a94\u6848\u301d\u4e0d\u6703\u88ab\u9084\u539f\u301e\uff0c\u56de\u5230\u6dfb\u52a0\u524d\u7684\u72c0\u614b ( unadd )\u3002<\/p>\n
git reset\u00a0HEAD~\u200c<\/pre>\n
 <\/p>\n
 <\/p>\n
\u82e5\u6211\u5011\u4f7f\u7528\u4e86 git reset HEAD ~\uff0c\u6211\u5011\u5c31\u5fc5\u9808\u518d\u91cd\u65b0\u6dfb\u52a0 ( gIt add ) \u4e00\u6b21\uff0c\u4f46\u5982\u679c\u4e0d\u60f3\u91cd\u65b0\u5beb\u8a3b\u89e3\uff0c\u53ef\u4ee5\u4f7f\u7528 git commit -c ORIG_HEAD \u6307\u4ee4\uff0c\u5247\u6703\u767c\u73fe\u4e4b\u524d\u7684 Commit \u9084\u5728\u3002<\/p>\n
 <\/p>\n
git commit -c ORIG_HEAD<\/pre>\n
 <\/p>\n
\u200c<\/p>\n
\u25a0 git reset \u53c3\u6578\u8aaa\u660e<\/strong><\/span><\/p>\n
 <\/p>\n
    \n
  • git reset –mixed<\/strong>\n
      \n
    • \u4e0d\u52a0\u53c3\u6578\u6642\uff0c\u9ed8\u8a8d\u70ba –mixed<\/li>\n
    • \u64a4\u56de\u4e4b\u5f8c\uff0c\u9084\u4ecd\u4f9b\u4e8c\u6b21\u4fee\u6539\u7684\u6a5f\u6703\u3002[\u63a8\u85a6<\/span>]<\/li>\n
    • \u72c0\u614b\uff1a\u6492\u56de\uff0c\u4f46\u300c\u6587\u4ef6\u4e0d\u6539\u8b8a\u300d\uff0c\u9700\u91cd\u65b0 add \u6587\u4ef6\u3002<\/li>\n<\/ul>\n<\/li>\n<\/ul>\n
       <\/p>\n
        \n
      • git reset –hard<\/strong>\n
          \n
        • \u64a4\u56de\u4e4b\u5f8c\uff0c\u6587\u4ef6\u4e5f\u76f4\u63a5\u56de\u5230\u6700\u539f\u59cb\u7684\u72c0\u614b\uff0c\u8f03\u4e0d\u63a8\u85a6\u3002<\/li>\n
        • \u72c0\u614b\uff1a\u6492\u56de\u4e14\u300c\u6587\u4ef6\u91cd\u7576\u521d\u539f\u59cb\u72c0\u614b\u300d\u3002<\/li>\n<\/ul>\n<\/li>\n<\/ul>\n
           <\/p>\n
            \n
          • git reset –soft<\/strong>\n
              \n
            • \u548c mixed \u548c hard \u8655\u65bc\u4e2d\u9593\u72c0\u614b\uff0c\u64a4\u56de\u4e4b\u5f8c\uff0c\u81ea\u52d5 add \u6587\u4ef6<\/li>\n
            • \u72c0\u614b\uff1a\u6492\u56de\uff0c\u4f46\u300c\u6587\u4ef6\u4e0d\u6539\u8b8a\u300d\uff0c\u9700\u91cd\u65b0 commit \u6587\u4ef6\u3002 ( \u5df2 add \u5b8c\u6210 )<\/li>\n<\/ul>\n<\/li>\n<\/ul>\n
               <\/p>\n
               <\/p>\n
              \u25a0 Git Rollback\u00a0<\/strong><\/span><\/p>\n
               <\/p>\n
               <\/p>\n
              \"\"<\/p>\n
               <\/p>\n
              \u4ee5\u4e0a\u5716\u70ba\u4f8b\uff0c\u6211\u5011\u5e0c\u671b\u9000\u56de Rollback \u7684\u7b2c\u4e00\u500b\uff0c\u6211\u5011\u53ef\u4ee5\u900f\u904e\u4e0b\u9762\u7684\u65b9\u5f0f\u9032\u884c\uff1a<\/p>\n
               <\/p>\n
              \/\/ \u900f\u904e\u301d\u54c8\u5e0c\u503c\u301e\u76f4\u63a5\u6307\u5b9a\u54ea\u4e00\u500b<\/p>\n
              git reset ade3034d<\/pre>\n
               <\/p>\n
               <\/p>\n
              \/\/ \u900f\u904e\u301d\u76f8\u5c0d\u4f4d\u7f6e\u301e\u6307\u5b9a ( \u5f80\u524d\u9000 2 \u500b\u4f4d\u7f6e )\uff0c\u8ddf\u4e0a\u8ff0\u6307\u4ee4\u76f8\u540c<\/p>\n
              git reset current~2<\/pre>\n
               <\/p>\n
               <\/p>\n
              \/\/ \u900f\u904e\u301d\u76f8\u5c0d\u4f4d\u7f6e\u301e\u6307\u5b9a ( \u5f80\u524d\u9000 2 \u500b\u4f4d\u7f6e )\uff0c\u8ddf\u4e0a\u8ff0\u6307\u4ee4\u76f8\u540c<\/p>\n
              git reset\u00a0HEAD~2<\/pre>\n
               <\/p>\n
               <\/p>\n
               <\/p>\n
              \u200c<\/p>\n","protected":false},"excerpt":{"rendered":"
              \u4eca\u5929\u6211\u5011\u4f86\u5b78\u7fd2 Rollback\uff0c\u7576\u6211\u5011\u5728\u4f7f\u7528 Git Commit \u6307\u4ee4\u7684\u6642\u5019\uff0c\u6709\u53ef\u80fd\u300c\u767c\u73fe\u4e00\u4e9b\u932f\u8aa4\u300d\u6216\u300c\u5f8c\u6094\u4e86\u300d\uff0c\u60f3\u8981\u64a4\u56de\uff0c\u5c31\u53ef\u4ee5\u4f7f\u7528 Git Reset \u9019\u4e00\u500b\u6307\u4ee4\uff0c\u4f46\u9019\u4e00\u500b\u6307\u4ee4\u5f88\u591a\u4eba\u5e38\u5e38\u641e\u4e0d\u6e05\u695a\u53c3\u6578 hard \/ soft \/ mixed \u7684\u5dee\u7570\uff0c\u4ee5\u4e0b\uff0c\u6211\u5011\u4e00\u6a23\u900f\u904e\u5be6\u4f5c\u7df4\u7fd2\u7684\u65b9\u5f0f\u4f86\u5b78\u7fd2\u9019\u4e09\u500b\u53c3\u6578\u7684\u5dee\u7570\u3002     \u25a0\u00a0git reset ( hard \/ soft )   \u5982\u679c\u6211\u5011 Commit \u4e4b\u5f8c\uff0c\u6211\u5011\u53ef\u4ee5\u900f\u904e git log \u53bb\u67e5\u8a62 Commit \u8a18\u9304\uff0c […]<\/p>\n","protected":false},"author":1,"featured_media":0,"comment_status":"open","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"jetpack_post_was_ever_published":false,"_jetpack_newsletter_access":"","_jetpack_dont_email_post_to_subs":false,"_jetpack_newsletter_tier_id":0,"_jetpack_memberships_contains_paywalled_content":false,"_jetpack_memberships_contains_paid_content":false,"footnotes":"","jetpack_publicize_message":"","jetpack_publicize_feature_enabled":true,"jetpack_social_post_already_shared":true,"jetpack_social_options":{"image_generator_settings":{"template":"highway","enabled":false}}},"categories":[3,251],"tags":[271,288,289],"jetpack_publicize_connections":[],"jetpack_featured_media_url":"","jetpack_sharing_enabled":true,"jetpack_shortlink":"https:\/\/wp.me\/p6rhcT-eX","jetpack-related-posts":[],"jetpack_likes_enabled":false,"_links":{"self":[{"href":"https:\/\/jqnets.com\/blog\/wp-json\/wp\/v2\/posts\/927"}],"collection":[{"href":"https:\/\/jqnets.com\/blog\/wp-json\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/jqnets.com\/blog\/wp-json\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/jqnets.com\/blog\/wp-json\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"https:\/\/jqnets.com\/blog\/wp-json\/wp\/v2\/comments?post=927"}],"version-history":[{"count":3,"href":"https:\/\/jqnets.com\/blog\/wp-json\/wp\/v2\/posts\/927\/revisions"}],"predecessor-version":[{"id":931,"href":"https:\/\/jqnets.com\/blog\/wp-json\/wp\/v2\/posts\/927\/revisions\/931"}],"wp:attachment":[{"href":"https:\/\/jqnets.com\/blog\/wp-json\/wp\/v2\/media?parent=927"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/jqnets.com\/blog\/wp-json\/wp\/v2\/categories?post=927"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/jqnets.com\/blog\/wp-json\/wp\/v2\/tags?post=927"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}