{"id":984,"date":"2014-05-09T08:47:54","date_gmt":"2014-05-09T08:47:54","guid":{"rendered":"http:\/\/tw.newtonstudio.com\/?p=984"},"modified":"2014-05-27T02:08:46","modified_gmt":"2014-05-27T02:08:46","slug":"git-reset-%e7%af%84%e4%be%8b","status":"publish","type":"post","link":"http:\/\/tw.newtonstudio.com\/?p=984","title":{"rendered":"git reset \u7bc4\u4f8b"},"content":{"rendered":"<p>1. How to UNDO git merge?<\/p>\n<pre>\r\ngit reset --hard HEAD~1 #HEAD~2\u662fUNDO\u5169\u6b65\u7684\u4e00\u6b21, --soft \u4e0d\u6703\u522a\u6389\u539f\u672c\u4fee\u6539\u904e\u7684\u90e8\u5206, --hard\u6703\u76f4\u63a5\u522a\u6389\u5df2\u4fee\u6539\u7684\u90e8\u5206\r\n<\/pre>\n<p>2. \u5982\u679c\u6211\u767c\u73fe\u6211\u4e0d\u5c0f\u5fc3git merge\u4e86, \u800c\u4e14\u9084push\u5230\u4e86\u9060\u7aef, \u6211\u8981\u600e\u9ebc\u8fa6?<\/p>\n<pre>\r\ngit reset --hard HEAD~1 # \u9019\u500b\u6307\u4ee4\u6703\u8b93\u4f60\u7684\u72c0\u614b\u56de\u5230\u9084\u6c92MERGE\u7684\u72c0\u614b\r\ngit push -f origin local\/origin # \u9019\u500b\u6307\u4ee4\u662f\u8feb\u4f7f\u9060\u7aef\u7684\u72c0\u614b\u8ddf\u6211\u672c\u6a5f\u7aef\u7684\u4e00\u6a23\r\n<\/pre>\n<p>3. \u5e0c\u671b\u5c07\u672c\u6a5f\u7684BRANCH \u9084\u539f\u5f97\u8ddf\u9060\u7aef\u4e00\u6a21\u4e00\u6a23 (\u5c0f\u5fc3\u4f7f\u7528)<\/p>\n<pre>\r\ngit fetch --all \r\ngit reset --hard origin\/master #master\u4ee3\u8868 branch\u7684\u540d\u7a31\r\n<\/pre>\n","protected":false},"excerpt":{"rendered":"<p>1. How to UNDO git merge? git reset &#8211;hard HEAD~1 #HEAD [&hellip;]<\/p>\n","protected":false},"author":1,"featured_media":0,"comment_status":"open","ping_status":"closed","sticky":false,"template":"","format":"standard","meta":{"footnotes":""},"categories":[1],"tags":[],"class_list":["post-984","post","type-post","status-publish","format-standard","hentry","category-uncategorized"],"_links":{"self":[{"href":"http:\/\/tw.newtonstudio.com\/index.php?rest_route=\/wp\/v2\/posts\/984","targetHints":{"allow":["GET"]}}],"collection":[{"href":"http:\/\/tw.newtonstudio.com\/index.php?rest_route=\/wp\/v2\/posts"}],"about":[{"href":"http:\/\/tw.newtonstudio.com\/index.php?rest_route=\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"http:\/\/tw.newtonstudio.com\/index.php?rest_route=\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"http:\/\/tw.newtonstudio.com\/index.php?rest_route=%2Fwp%2Fv2%2Fcomments&post=984"}],"version-history":[{"count":3,"href":"http:\/\/tw.newtonstudio.com\/index.php?rest_route=\/wp\/v2\/posts\/984\/revisions"}],"predecessor-version":[{"id":1007,"href":"http:\/\/tw.newtonstudio.com\/index.php?rest_route=\/wp\/v2\/posts\/984\/revisions\/1007"}],"wp:attachment":[{"href":"http:\/\/tw.newtonstudio.com\/index.php?rest_route=%2Fwp%2Fv2%2Fmedia&parent=984"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"http:\/\/tw.newtonstudio.com\/index.php?rest_route=%2Fwp%2Fv2%2Fcategories&post=984"},{"taxonomy":"post_tag","embeddable":true,"href":"http:\/\/tw.newtonstudio.com\/index.php?rest_route=%2Fwp%2Fv2%2Ftags&post=984"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}