{"id":37134,"date":"2023-07-10T19:56:37","date_gmt":"2024-01-05T06:22:13","guid":{"rendered":"https:\/\/www.silicloud.com\/zh\/blog\/%e5%8d%b3%e4%bd%bf%e5%9c%a8git%e4%b8%ad%e6%90%9e%e7%a0%b8%e4%ba%86%ef%bc%8c%e5%8f%aa%e8%a6%81%e6%98%afgit%ef%bc%8c%e5%b0%b1%e6%b2%a1%e9%97%ae%e9%a2%98%e3%80%82\/"},"modified":"2024-04-30T12:56:00","modified_gmt":"2024-04-30T04:56:00","slug":"%e5%8d%b3%e4%bd%bf%e5%9c%a8git%e4%b8%ad%e6%90%9e%e7%a0%b8%e4%ba%86%ef%bc%8c%e5%8f%aa%e8%a6%81%e6%98%afgit%ef%bc%8c%e5%b0%b1%e6%b2%a1%e9%97%ae%e9%a2%98%e3%80%82","status":"publish","type":"post","link":"https:\/\/www.silicloud.com\/zh\/blog\/%e5%8d%b3%e4%bd%bf%e5%9c%a8git%e4%b8%ad%e6%90%9e%e7%a0%b8%e4%ba%86%ef%bc%8c%e5%8f%aa%e8%a6%81%e6%98%afgit%ef%bc%8c%e5%b0%b1%e6%b2%a1%e9%97%ae%e9%a2%98%e3%80%82\/","title":{"rendered":"\u5373\u4f7f\u5728git\u4e2d\u641e\u7838\u4e86\uff0c\u53ea\u8981\u662fgit\uff0c\u5c31\u6ca1\u95ee\u9898"},"content":{"rendered":"

\u5e72\u4e86\u4ec0\u4e48\u8ba9\u4eba\u5403\u60ca\u7684\u4e8b\u60c5<\/h2>\n

git rebase –hard \u3067\u5fc5\u8981\u306a\u5909\u66f4\u3082\u6d88\u3057\u3066\u3057\u307e\u3063\u305f\u3002<\/p>\n

Source Tree\u3060\u3068\u73fe\u5728\u306e\u30d6\u30e9\u30f3\u30c1\u3092\u3053\u306e\u30b3\u30df\u30c3\u30c8\u307e\u3067\u30ea\u30bb\u30c3\u30c8\u3001(\u30d6\u30e9\u30f3\u30c1\u540d)\u3092\u3053\u306e\u30b3\u30df\u30c3\u30c8\u307e\u3067\u623b\u3059\u3092Hard\u3067\u5b9f\u884c<\/p>\n

\u5fc5\u8981\u306a\u30d6\u30e9\u30f3\u30c1\u3092\u524a\u9664\u3057\u3066\u3057\u307e\u3063\u305f<\/p>\n

\u306a\u3069\u3002\u3002\u3002<\/p>\n

“git reflog\u662f\u4ec0\u4e48\uff1f”<\/h2>\n

git reflog \u662f\u4e00\u4e2a\u53ef\u4ee5\u67e5\u770b Git \u64cd\u4f5c\u8bb0\u5f55\u7684\u547d\u4ee4\u3002<\/p>\n

$ git reflog\r\nc2344c123 (HEAD -> develop, origin\/develop, origin\/HEAD) HEAD@{0}: pull origin develop: Fast-forward\r\nb452355c0 HEAD@{1}: checkout: moving from master to develop\r\nd52edfc46 HEAD@{2}: checkout: moving from develop to master\r\nb153446c9 HEAD@{3}: reset: moving to b953044c833ad515f06be9ba9c32111a353b65f3\r\n<\/code><\/pre>\n
\u6839\u636e\u4e0a\u9762\u7684\u65e5\u5fd7\uff0cGit\u64cd\u4f5c\u88ab\u6267\u884c\u5982\u4e0b\u3002<\/p>\n
    \n
  • \n
      b953044c833ad515f06be9ba9c32111a353b65f3\u306e\u30b3\u30df\u30c3\u30c8\u306b\u30ea\u30bb\u30c3\u30c8<\/ul>\n<\/li>\n<\/ul>\n
       <\/p>\n
        \n
      • \n
          develop\u30d6\u30e9\u30f3\u30c1\u304b\u3089master\u30d6\u30e9\u30f3\u30c1\u306b\u30c1\u30a7\u30c3\u30af\u30a2\u30a6\u30c8<\/ul>\n<\/li>\n<\/ul>\n
           <\/p>\n
            \n
          • \n
              master\u30d6\u30e9\u30f3\u30c1\u304b\u3089develop\u30d6\u30e9\u30f3\u30c1\u306b\u30c1\u30a7\u30c3\u30af\u30a2\u30a6\u30c8<\/ul>\n<\/li>\n<\/ul>\n
               <\/p>\n
                develop\u30d6\u30e9\u30f3\u30c1\u3067pull<\/ul>\n
                \u91cd\u7f6e\u64cd\u4f5c<\/h2>\n
                \u901a\u8fc7\u4e4b\u524d\u7684git reflog\u547d\u4ee4\u786e\u8ba4\u64cd\u4f5c\u8bb0\u5f55\u540e\uff0c\u53ef\u4ee5\u4f7f\u7528git reset –hard\u547d\u4ee4\u6765\u56de\u5230\u4e00\u6b21\u64cd\u4f5c\u5931\u8d25\u4e4b\u524d\u7684\u72b6\u6001\uff0c\u4ece\u800c\u6062\u590d\u5230\u64cd\u4f5c\u5931\u8d25\u4e4b\u524d\u7684\u72b6\u6001\u3002<\/p>\n
                git reset --hard HEAD@{1}\r\n<\/code><\/pre>\n
                \u603b\u7ed3<\/h2>\n
                  \n
                • \n
                    \u8ffd\u52a0\u3057\u305f\u30d5\u30a1\u30a4\u30eb\u3092\u30d7\u30c3\u30b7\u30e5\u3059\u308b\u524d\u306bgit reset\u3067\u6d88\u3057\u3066\u3057\u307e\u3063\u305f<\/ul>\n<\/li>\n<\/ul>\n
                     <\/p>\n
                      \u30d7\u30c3\u30b7\u30e5\u524d\u306b\u30d6\u30e9\u30f3\u30c1\u3092\u524a\u9664\u3057\u3066\u3057\u307e\u3063\u305f<\/ul>\n
                      \u5373\u4f7f\u5728Git\u4e0a\u641e\u7838\u4e86\uff0c\u4e5f\u53ef\u4ee5\u901a\u8fc7Git\u57fa\u672c\u4e0a\u8fdb\u884c\u6062\u590d\u3002
                      \n\u5728\u56f0\u96be\u65f6\uff0c\u8bf7\u5c1d\u8bd5\u4f7f\u7528git reflog\u3002<\/p>\n","protected":false},"excerpt":{"rendered":"
                      \u5e72\u4e86\u4ec0\u4e48\u8ba9\u4eba\u5403\u60ca\u7684\u4e8b\u60c5 git rebase –hard \u3067\u5fc5\u8981\u306a\u5909\u66f4\u3082\u6d88\u3057\u3066\u3057\u307e\u3063\u305f\u3002 Sour […]<\/p>\n","protected":false},"author":10,"featured_media":0,"comment_status":"closed","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"footnotes":""},"categories":[1],"tags":[],"class_list":["post-37134","post","type-post","status-publish","format-standard","hentry","category-uncategorized"],"yoast_head":"\n\u5373\u4f7f\u5728git\u4e2d\u641e\u7838\u4e86\uff0c\u53ea\u8981\u662fgit\uff0c\u5c31\u6ca1\u95ee\u9898 - 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\/\u5373\u4f7f\u5728git\u4e2d\u641e\u7838\u4e86\uff0c\u53ea\u8981\u662fgit\uff0c\u5c31\u6ca1\u95ee\u9898\u3002\/\" \/>\n<meta property=\"og:locale\" content=\"zh_CN\" \/>\n<meta property=\"og:type\" content=\"article\" \/>\n<meta property=\"og:title\" content=\"\u5373\u4f7f\u5728git\u4e2d\u641e\u7838\u4e86\uff0c\u53ea\u8981\u662fgit\uff0c\u5c31\u6ca1\u95ee\u9898\" \/>\n<meta property=\"og:description\" content=\"\u5e72\u4e86\u4ec0\u4e48\u8ba9\u4eba\u5403\u60ca\u7684\u4e8b\u60c5 git rebase –hard \u3067\u5fc5\u8981\u306a\u5909\u66f4\u3082\u6d88\u3057\u3066\u3057\u307e\u3063\u305f\u3002 Sour […]\" \/>\n<meta property=\"og:url\" content=\"https:\/\/www.silicloud.com\/zh\/blog\/\u5373\u4f7f\u5728git\u4e2d\u641e\u7838\u4e86\uff0c\u53ea\u8981\u662fgit\uff0c\u5c31\u6ca1\u95ee\u9898\u3002\/\" \/>\n<meta property=\"og:site_name\" content=\"Blog - Silicon Cloud\" \/>\n<meta property=\"article:published_time\" content=\"2024-01-05T06:22:13+00:00\" \/>\n<meta property=\"article:modified_time\" content=\"2024-04-30T04:56:00+00:00\" \/>\n<meta name=\"author\" content=\"\u5b87, \u534e\" \/>\n<meta name=\"twitter:card\" content=\"summary_large_image\" \/>\n<meta name=\"twitter:label1\" content=\"\u4f5c\u8005\" \/>\n\t<meta name=\"twitter:data1\" content=\"\u5b87, \u534e\" \/>\n<script type=\"application\/ld+json\" class=\"yoast-schema-graph\">{\"@context\":\"https:\/\/schema.org\",\"@graph\":[{\"@type\":\"WebPage\",\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/%e5%8d%b3%e4%bd%bf%e5%9c%a8git%e4%b8%ad%e6%90%9e%e7%a0%b8%e4%ba%86%ef%bc%8c%e5%8f%aa%e8%a6%81%e6%98%afgit%ef%bc%8c%e5%b0%b1%e6%b2%a1%e9%97%ae%e9%a2%98%e3%80%82\/\",\"url\":\"https:\/\/www.silicloud.com\/zh\/blog\/%e5%8d%b3%e4%bd%bf%e5%9c%a8git%e4%b8%ad%e6%90%9e%e7%a0%b8%e4%ba%86%ef%bc%8c%e5%8f%aa%e8%a6%81%e6%98%afgit%ef%bc%8c%e5%b0%b1%e6%b2%a1%e9%97%ae%e9%a2%98%e3%80%82\/\",\"name\":\"\u5373\u4f7f\u5728git\u4e2d\u641e\u7838\u4e86\uff0c\u53ea\u8981\u662fgit\uff0c\u5c31\u6ca1\u95ee\u9898 - Blog - Silicon Cloud\",\"isPartOf\":{\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/#website\"},\"datePublished\":\"2024-01-05T06:22:13+00:00\",\"dateModified\":\"2024-04-30T04:56:00+00:00\",\"author\":{\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/513018e4e121d3add1b7c5de8be21458\"},\"breadcrumb\":{\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/%e5%8d%b3%e4%bd%bf%e5%9c%a8git%e4%b8%ad%e6%90%9e%e7%a0%b8%e4%ba%86%ef%bc%8c%e5%8f%aa%e8%a6%81%e6%98%afgit%ef%bc%8c%e5%b0%b1%e6%b2%a1%e9%97%ae%e9%a2%98%e3%80%82\/#breadcrumb\"},\"inLanguage\":\"zh-Hans\",\"potentialAction\":[{\"@type\":\"ReadAction\",\"target\":[\"https:\/\/www.silicloud.com\/zh\/blog\/%e5%8d%b3%e4%bd%bf%e5%9c%a8git%e4%b8%ad%e6%90%9e%e7%a0%b8%e4%ba%86%ef%bc%8c%e5%8f%aa%e8%a6%81%e6%98%afgit%ef%bc%8c%e5%b0%b1%e6%b2%a1%e9%97%ae%e9%a2%98%e3%80%82\/\"]}]},{\"@type\":\"BreadcrumbList\",\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/%e5%8d%b3%e4%bd%bf%e5%9c%a8git%e4%b8%ad%e6%90%9e%e7%a0%b8%e4%ba%86%ef%bc%8c%e5%8f%aa%e8%a6%81%e6%98%afgit%ef%bc%8c%e5%b0%b1%e6%b2%a1%e9%97%ae%e9%a2%98%e3%80%82\/#breadcrumb\",\"itemListElement\":[{\"@type\":\"ListItem\",\"position\":1,\"name\":\"\u9996\u9875\",\"item\":\"https:\/\/www.silicloud.com\/zh\/blog\/\"},{\"@type\":\"ListItem\",\"position\":2,\"name\":\"\u5373\u4f7f\u5728git\u4e2d\u641e\u7838\u4e86\uff0c\u53ea\u8981\u662fgit\uff0c\u5c31\u6ca1\u95ee\u9898\"}]},{\"@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\/513018e4e121d3add1b7c5de8be21458\",\"name\":\"\u5b87, \u534e\",\"image\":{\"@type\":\"ImageObject\",\"inLanguage\":\"zh-Hans\",\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/image\/\",\"url\":\"https:\/\/secure.gravatar.com\/avatar\/63cd45cbc05a35fc4ff7637a163c83c4962ef58d27472726c3a3e0c9c5194f0f?s=96&d=mm&r=g\",\"contentUrl\":\"https:\/\/secure.gravatar.com\/avatar\/63cd45cbc05a35fc4ff7637a163c83c4962ef58d27472726c3a3e0c9c5194f0f?s=96&d=mm&r=g\",\"caption\":\"\u5b87, \u534e\"},\"url\":\"https:\/\/www.silicloud.com\/zh\/blog\/author\/yuhua\/\"},{\"@type\":\"ImageObject\",\"inLanguage\":\"zh-Hans\",\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/%e5%8d%b3%e4%bd%bf%e5%9c%a8git%e4%b8%ad%e6%90%9e%e7%a0%b8%e4%ba%86%ef%bc%8c%e5%8f%aa%e8%a6%81%e6%98%afgit%ef%bc%8c%e5%b0%b1%e6%b2%a1%e9%97%ae%e9%a2%98%e3%80%82\/#local-main-organization-logo\",\"url\":\"\",\"contentUrl\":\"\",\"caption\":\"Blog - Silicon Cloud\"}]}<\/script>\n<!-- \/ Yoast SEO Premium plugin. -->","yoast_head_json":{"title":"\u5373\u4f7f\u5728git\u4e2d\u641e\u7838\u4e86\uff0c\u53ea\u8981\u662fgit\uff0c\u5c31\u6ca1\u95ee\u9898 - 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\/\u5373\u4f7f\u5728git\u4e2d\u641e\u7838\u4e86\uff0c\u53ea\u8981\u662fgit\uff0c\u5c31\u6ca1\u95ee\u9898\u3002\/","og_locale":"zh_CN","og_type":"article","og_title":"\u5373\u4f7f\u5728git\u4e2d\u641e\u7838\u4e86\uff0c\u53ea\u8981\u662fgit\uff0c\u5c31\u6ca1\u95ee\u9898","og_description":"\u5e72\u4e86\u4ec0\u4e48\u8ba9\u4eba\u5403\u60ca\u7684\u4e8b\u60c5 git rebase –hard \u3067\u5fc5\u8981\u306a\u5909\u66f4\u3082\u6d88\u3057\u3066\u3057\u307e\u3063\u305f\u3002 Sour […]","og_url":"https:\/\/www.silicloud.com\/zh\/blog\/\u5373\u4f7f\u5728git\u4e2d\u641e\u7838\u4e86\uff0c\u53ea\u8981\u662fgit\uff0c\u5c31\u6ca1\u95ee\u9898\u3002\/","og_site_name":"Blog - Silicon Cloud","article_published_time":"2024-01-05T06:22:13+00:00","article_modified_time":"2024-04-30T04:56:00+00:00","author":"\u5b87, \u534e","twitter_card":"summary_large_image","twitter_misc":{"\u4f5c\u8005":"\u5b87, \u534e"},"schema":{"@context":"https:\/\/schema.org","@graph":[{"@type":"WebPage","@id":"https:\/\/www.silicloud.com\/zh\/blog\/%e5%8d%b3%e4%bd%bf%e5%9c%a8git%e4%b8%ad%e6%90%9e%e7%a0%b8%e4%ba%86%ef%bc%8c%e5%8f%aa%e8%a6%81%e6%98%afgit%ef%bc%8c%e5%b0%b1%e6%b2%a1%e9%97%ae%e9%a2%98%e3%80%82\/","url":"https:\/\/www.silicloud.com\/zh\/blog\/%e5%8d%b3%e4%bd%bf%e5%9c%a8git%e4%b8%ad%e6%90%9e%e7%a0%b8%e4%ba%86%ef%bc%8c%e5%8f%aa%e8%a6%81%e6%98%afgit%ef%bc%8c%e5%b0%b1%e6%b2%a1%e9%97%ae%e9%a2%98%e3%80%82\/","name":"\u5373\u4f7f\u5728git\u4e2d\u641e\u7838\u4e86\uff0c\u53ea\u8981\u662fgit\uff0c\u5c31\u6ca1\u95ee\u9898 - Blog - Silicon Cloud","isPartOf":{"@id":"https:\/\/www.silicloud.com\/zh\/blog\/#website"},"datePublished":"2024-01-05T06:22:13+00:00","dateModified":"2024-04-30T04:56:00+00:00","author":{"@id":"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/513018e4e121d3add1b7c5de8be21458"},"breadcrumb":{"@id":"https:\/\/www.silicloud.com\/zh\/blog\/%e5%8d%b3%e4%bd%bf%e5%9c%a8git%e4%b8%ad%e6%90%9e%e7%a0%b8%e4%ba%86%ef%bc%8c%e5%8f%aa%e8%a6%81%e6%98%afgit%ef%bc%8c%e5%b0%b1%e6%b2%a1%e9%97%ae%e9%a2%98%e3%80%82\/#breadcrumb"},"inLanguage":"zh-Hans","potentialAction":[{"@type":"ReadAction","target":["https:\/\/www.silicloud.com\/zh\/blog\/%e5%8d%b3%e4%bd%bf%e5%9c%a8git%e4%b8%ad%e6%90%9e%e7%a0%b8%e4%ba%86%ef%bc%8c%e5%8f%aa%e8%a6%81%e6%98%afgit%ef%bc%8c%e5%b0%b1%e6%b2%a1%e9%97%ae%e9%a2%98%e3%80%82\/"]}]},{"@type":"BreadcrumbList","@id":"https:\/\/www.silicloud.com\/zh\/blog\/%e5%8d%b3%e4%bd%bf%e5%9c%a8git%e4%b8%ad%e6%90%9e%e7%a0%b8%e4%ba%86%ef%bc%8c%e5%8f%aa%e8%a6%81%e6%98%afgit%ef%bc%8c%e5%b0%b1%e6%b2%a1%e9%97%ae%e9%a2%98%e3%80%82\/#breadcrumb","itemListElement":[{"@type":"ListItem","position":1,"name":"\u9996\u9875","item":"https:\/\/www.silicloud.com\/zh\/blog\/"},{"@type":"ListItem","position":2,"name":"\u5373\u4f7f\u5728git\u4e2d\u641e\u7838\u4e86\uff0c\u53ea\u8981\u662fgit\uff0c\u5c31\u6ca1\u95ee\u9898"}]},{"@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\/513018e4e121d3add1b7c5de8be21458","name":"\u5b87, \u534e","image":{"@type":"ImageObject","inLanguage":"zh-Hans","@id":"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/image\/","url":"https:\/\/secure.gravatar.com\/avatar\/63cd45cbc05a35fc4ff7637a163c83c4962ef58d27472726c3a3e0c9c5194f0f?s=96&d=mm&r=g","contentUrl":"https:\/\/secure.gravatar.com\/avatar\/63cd45cbc05a35fc4ff7637a163c83c4962ef58d27472726c3a3e0c9c5194f0f?s=96&d=mm&r=g","caption":"\u5b87, \u534e"},"url":"https:\/\/www.silicloud.com\/zh\/blog\/author\/yuhua\/"},{"@type":"ImageObject","inLanguage":"zh-Hans","@id":"https:\/\/www.silicloud.com\/zh\/blog\/%e5%8d%b3%e4%bd%bf%e5%9c%a8git%e4%b8%ad%e6%90%9e%e7%a0%b8%e4%ba%86%ef%bc%8c%e5%8f%aa%e8%a6%81%e6%98%afgit%ef%bc%8c%e5%b0%b1%e6%b2%a1%e9%97%ae%e9%a2%98%e3%80%82\/#local-main-organization-logo","url":"","contentUrl":"","caption":"Blog - Silicon Cloud"}]}},"_links":{"self":[{"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/posts\/37134","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\/10"}],"replies":[{"embeddable":true,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/comments?post=37134"}],"version-history":[{"count":2,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/posts\/37134\/revisions"}],"predecessor-version":[{"id":92037,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/posts\/37134\/revisions\/92037"}],"wp:attachment":[{"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/media?parent=37134"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/categories?post=37134"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/tags?post=37134"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}