{"id":37315,"date":"2023-02-20T17:47:53","date_gmt":"2023-05-06T13:29:44","guid":{"rendered":"https:\/\/www.silicloud.com\/zh\/blog\/git%e9%80%9f%e6%9f%a5%e8%a1%a8-3\/"},"modified":"2024-04-29T15:28:30","modified_gmt":"2024-04-29T07:28:30","slug":"git%e9%80%9f%e6%9f%a5%e8%a1%a8-3","status":"publish","type":"post","link":"https:\/\/www.silicloud.com\/zh\/blog\/git%e9%80%9f%e6%9f%a5%e8%a1%a8-3\/","title":{"rendered":"Git\u901f\u67e5\u8868"},"content":{"rendered":"

\u9996\u5148<\/h1>\n

\u5728\u5de5\u4f5c\u7684\u65f6\u5019\uff0c\u4f1a\u6709\u8fd9\u6837\u60f3\u505a\u8fd9\u6837\u60f3\u505a\u7684\u65f6\u5019\uff0c\u6240\u4ee5\u8bf7\u522b\u5fd8\u4e86…<\/p>\n

\u6211\u60f3\u8981\u67e5\u770b\u5df2\u5220\u9664\u6587\u4ef6\u7684\u65e5\u5fd7\uff08git log\uff09\u3002<\/h1>\n
><\/span> git<\/span> log<\/span> --<\/span> [<\/span>\u30d5\u30a1\u30a4\u30eb\u30d1\u30b9<\/span>]<\/span>\r\n<\/code><\/pre>\n
\u6211\u60f3\u8981\u56de\u5230\u7279\u5b9a\u7684\u63d0\u4ea4ID\uff08git reset\uff09\u3002<\/h1>\n
# \u7279\u5b9a\u30d0\u30fc\u30b8\u30e7\u30f3\u306b\u623b\u3059<\/span>\r\n><\/span> git<\/span> reset<\/span> hard<\/span> [<\/span>\u30b3\u30df\u30c3\u30c8<\/span>ID<\/span>(<\/span>6<\/span> or<\/span> 40<\/span> chars<\/span>)]<\/span>\r\n\r\n# \u624b\u9806<\/span>\r\n#  \uff11\uff0e\u7279\u5b9a\u306e\u30b3\u30df\u30c3\u30c8ID\u306b\u623b\u3059<\/span>\r\n#  \uff12\uff0e\u30ea\u30e2\u30fc\u30c8\u30d6\u30e9\u30f3\u30c1\u524a\u9664<\/span>\r\n#  \uff13\uff0e\u30ea\u30e2\u30fc\u30c8\u30d6\u30e9\u30f3\u30c1\u306b\u30d7\u30c3\u30b7\u30e5<\/span>\r\n<\/code><\/pre>\n
\u6211\u60f3\u628a\u7279\u5b9a\u7684\u63d0\u4ea4\u5408\u5e76\u8fc7\u6765\uff08git cherry-pick\uff09\u3002<\/h1>\n
><\/span> git<\/span> cherry-pick<\/span> [<\/span>\u30b3\u30df\u30c3\u30c8<\/span>ID<\/span>(<\/span>6<\/span> or<\/span> 40<\/span> chars<\/span>)]<\/span>\r\n\r\n# \u30b3\u30df\u30c3\u30c8ID\u5074\u3092\u512a\u5148\u3057\u3066\u30de\u30fc\u30b8<\/span>\r\n><\/span> git<\/span> cherry-pick<\/span> -Xtheirs<\/span> [<\/span>\u30b3\u30df\u30c3\u30c8<\/span>ID<\/span>(<\/span>6<\/span> or<\/span> 40<\/span> chars<\/span>)]<\/span>\r\n\r\n# Merge\u30b3\u30df\u30c3\u30c8\u3092\u9069\u7528<\/span>\r\n><\/span> git<\/span> cherry-pick<\/span> -m<\/span> [<\/span>\u30b3\u30df\u30c3\u30c8<\/span>ID<\/span>(<\/span>6<\/span> or<\/span> 40<\/span> chars<\/span>)]<\/span>\r\n<\/code><\/pre>\n
\u3010\u53c2\u8003\u7f51\u7ad9\u3011
\n\u25c6git cherry-pick\u7684\u57fa\u672c\u89c4\u683c\u548c\u4e3b\u8981\u9009\u9879
\nhttps:\/\/www-creators.com\/archives\/2578<\/p>\n
\u6211\u60f3\u56de\u5230\u7279\u5b9a\u7248\u672c(git checkout)\u3002<\/h1>\n
# \u7279\u5b9a\u30d0\u30fc\u30b8\u30e7\u30f3\u306b\u623b\u3059<\/span>\r\n><\/span> git<\/span> checktout<\/span> [<\/span>\u30b3\u30df\u30c3\u30c8<\/span>id<\/span>]<\/span>\r\n\r\n# \u6700\u65b0\u30d0\u30fc\u30b8\u30e7\u30f3\u306b\u623b\u3059<\/span>\r\n><\/span> git<\/span> checkout<\/span> master<\/span>\r\n<\/code><\/pre>\n
\u3010\u53c2\u8003\u7f51\u7ad9\u3011
\n\u25c6\u3010git checkout HEAD — . \u3011\u4e2d” — “\u548c” . “\u7684\u542b\u4e49\uff0c\u6211\u5728\u4e0d\u77e5\u60c5\u7684\u60c5\u51b5\u4e0b\u4f7f\u7528\u4e86\u5b83
\nhttps:\/\/qiita.com\/wagase\/items\/5b65d0efaf3d4985256b
\n\u25c6[git] \u5e38\u7528\u7684\u56de\u9000\u547d\u4ee4\u603b\u7ed3
\nhttps:\/\/qiita.com\/rch1223\/items\/9377446c3d010d91399b<\/p>\n","protected":false},"excerpt":{"rendered":"
\u9996\u5148 \u5728\u5de5\u4f5c\u7684\u65f6\u5019\uff0c\u4f1a\u6709\u8fd9\u6837\u60f3\u505a\u8fd9\u6837\u60f3\u505a\u7684\u65f6\u5019\uff0c\u6240\u4ee5\u8bf7\u522b\u5fd8\u4e86… \u6211\u60f3\u8981\u67e5\u770b\u5df2\u5220\u9664\u6587\u4ef6\u7684\u65e5\u5fd7\uff08git […]<\/p>\n","protected":false},"author":11,"featured_media":0,"comment_status":"closed","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"footnotes":""},"categories":[1],"tags":[],"class_list":["post-37315","post","type-post","status-publish","format-standard","hentry","category-uncategorized"],"yoast_head":"\nGit\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\u901f\u67e5\u8868-3\/\" \/>\n<meta property=\"og:locale\" content=\"zh_CN\" \/>\n<meta property=\"og:type\" content=\"article\" \/>\n<meta property=\"og:title\" content=\"Git\u901f\u67e5\u8868\" \/>\n<meta property=\"og:description\" content=\"\u9996\u5148 \u5728\u5de5\u4f5c\u7684\u65f6\u5019\uff0c\u4f1a\u6709\u8fd9\u6837\u60f3\u505a\u8fd9\u6837\u60f3\u505a\u7684\u65f6\u5019\uff0c\u6240\u4ee5\u8bf7\u522b\u5fd8\u4e86… \u6211\u60f3\u8981\u67e5\u770b\u5df2\u5220\u9664\u6587\u4ef6\u7684\u65e5\u5fd7\uff08git […]\" \/>\n<meta property=\"og:url\" content=\"https:\/\/www.silicloud.com\/zh\/blog\/git\u901f\u67e5\u8868-3\/\" \/>\n<meta property=\"og:site_name\" content=\"Blog - Silicon Cloud\" \/>\n<meta property=\"article:published_time\" content=\"2023-05-06T13:29:44+00:00\" \/>\n<meta property=\"article:modified_time\" content=\"2024-04-29T07:28:30+00:00\" \/>\n<meta name=\"author\" content=\"\u65b0, \u97f5\" \/>\n<meta name=\"twitter:card\" content=\"summary_large_image\" \/>\n<meta name=\"twitter:label1\" content=\"\u4f5c\u8005\" \/>\n\t<meta name=\"twitter:data1\" content=\"\u65b0, \u97f5\" \/>\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%e9%80%9f%e6%9f%a5%e8%a1%a8-3\/\",\"url\":\"https:\/\/www.silicloud.com\/zh\/blog\/git%e9%80%9f%e6%9f%a5%e8%a1%a8-3\/\",\"name\":\"Git\u901f\u67e5\u8868 - Blog - Silicon Cloud\",\"isPartOf\":{\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/#website\"},\"datePublished\":\"2023-05-06T13:29:44+00:00\",\"dateModified\":\"2024-04-29T07:28:30+00:00\",\"author\":{\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/4ba4019495123db3038fd0809e6959c9\"},\"breadcrumb\":{\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/git%e9%80%9f%e6%9f%a5%e8%a1%a8-3\/#breadcrumb\"},\"inLanguage\":\"zh-Hans\",\"potentialAction\":[{\"@type\":\"ReadAction\",\"target\":[\"https:\/\/www.silicloud.com\/zh\/blog\/git%e9%80%9f%e6%9f%a5%e8%a1%a8-3\/\"]}]},{\"@type\":\"BreadcrumbList\",\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/git%e9%80%9f%e6%9f%a5%e8%a1%a8-3\/#breadcrumb\",\"itemListElement\":[{\"@type\":\"ListItem\",\"position\":1,\"name\":\"\u9996\u9875\",\"item\":\"https:\/\/www.silicloud.com\/zh\/blog\/\"},{\"@type\":\"ListItem\",\"position\":2,\"name\":\"Git\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\/4ba4019495123db3038fd0809e6959c9\",\"name\":\"\u65b0, \u97f5\",\"image\":{\"@type\":\"ImageObject\",\"inLanguage\":\"zh-Hans\",\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/image\/\",\"url\":\"https:\/\/secure.gravatar.com\/avatar\/d484b6c6e4ae82e8a9efea989e1d2af46d9b6ef128101e63b18f559fca0ae627?s=96&d=mm&r=g\",\"contentUrl\":\"https:\/\/secure.gravatar.com\/avatar\/d484b6c6e4ae82e8a9efea989e1d2af46d9b6ef128101e63b18f559fca0ae627?s=96&d=mm&r=g\",\"caption\":\"\u65b0, \u97f5\"},\"url\":\"https:\/\/www.silicloud.com\/zh\/blog\/author\/yunxin\/\"},{\"@type\":\"ImageObject\",\"inLanguage\":\"zh-Hans\",\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/git%e9%80%9f%e6%9f%a5%e8%a1%a8-3\/#local-main-organization-logo\",\"url\":\"\",\"contentUrl\":\"\",\"caption\":\"Blog - Silicon Cloud\"}]}<\/script>\n<!-- \/ Yoast SEO Premium plugin. -->","yoast_head_json":{"title":"Git\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\u901f\u67e5\u8868-3\/","og_locale":"zh_CN","og_type":"article","og_title":"Git\u901f\u67e5\u8868","og_description":"\u9996\u5148 \u5728\u5de5\u4f5c\u7684\u65f6\u5019\uff0c\u4f1a\u6709\u8fd9\u6837\u60f3\u505a\u8fd9\u6837\u60f3\u505a\u7684\u65f6\u5019\uff0c\u6240\u4ee5\u8bf7\u522b\u5fd8\u4e86… \u6211\u60f3\u8981\u67e5\u770b\u5df2\u5220\u9664\u6587\u4ef6\u7684\u65e5\u5fd7\uff08git […]","og_url":"https:\/\/www.silicloud.com\/zh\/blog\/git\u901f\u67e5\u8868-3\/","og_site_name":"Blog - Silicon Cloud","article_published_time":"2023-05-06T13:29:44+00:00","article_modified_time":"2024-04-29T07:28:30+00:00","author":"\u65b0, \u97f5","twitter_card":"summary_large_image","twitter_misc":{"\u4f5c\u8005":"\u65b0, \u97f5"},"schema":{"@context":"https:\/\/schema.org","@graph":[{"@type":"WebPage","@id":"https:\/\/www.silicloud.com\/zh\/blog\/git%e9%80%9f%e6%9f%a5%e8%a1%a8-3\/","url":"https:\/\/www.silicloud.com\/zh\/blog\/git%e9%80%9f%e6%9f%a5%e8%a1%a8-3\/","name":"Git\u901f\u67e5\u8868 - Blog - Silicon Cloud","isPartOf":{"@id":"https:\/\/www.silicloud.com\/zh\/blog\/#website"},"datePublished":"2023-05-06T13:29:44+00:00","dateModified":"2024-04-29T07:28:30+00:00","author":{"@id":"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/4ba4019495123db3038fd0809e6959c9"},"breadcrumb":{"@id":"https:\/\/www.silicloud.com\/zh\/blog\/git%e9%80%9f%e6%9f%a5%e8%a1%a8-3\/#breadcrumb"},"inLanguage":"zh-Hans","potentialAction":[{"@type":"ReadAction","target":["https:\/\/www.silicloud.com\/zh\/blog\/git%e9%80%9f%e6%9f%a5%e8%a1%a8-3\/"]}]},{"@type":"BreadcrumbList","@id":"https:\/\/www.silicloud.com\/zh\/blog\/git%e9%80%9f%e6%9f%a5%e8%a1%a8-3\/#breadcrumb","itemListElement":[{"@type":"ListItem","position":1,"name":"\u9996\u9875","item":"https:\/\/www.silicloud.com\/zh\/blog\/"},{"@type":"ListItem","position":2,"name":"Git\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\/4ba4019495123db3038fd0809e6959c9","name":"\u65b0, \u97f5","image":{"@type":"ImageObject","inLanguage":"zh-Hans","@id":"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/image\/","url":"https:\/\/secure.gravatar.com\/avatar\/d484b6c6e4ae82e8a9efea989e1d2af46d9b6ef128101e63b18f559fca0ae627?s=96&d=mm&r=g","contentUrl":"https:\/\/secure.gravatar.com\/avatar\/d484b6c6e4ae82e8a9efea989e1d2af46d9b6ef128101e63b18f559fca0ae627?s=96&d=mm&r=g","caption":"\u65b0, \u97f5"},"url":"https:\/\/www.silicloud.com\/zh\/blog\/author\/yunxin\/"},{"@type":"ImageObject","inLanguage":"zh-Hans","@id":"https:\/\/www.silicloud.com\/zh\/blog\/git%e9%80%9f%e6%9f%a5%e8%a1%a8-3\/#local-main-organization-logo","url":"","contentUrl":"","caption":"Blog - Silicon Cloud"}]}},"_links":{"self":[{"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/posts\/37315","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\/11"}],"replies":[{"embeddable":true,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/comments?post=37315"}],"version-history":[{"count":2,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/posts\/37315\/revisions"}],"predecessor-version":[{"id":86100,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/posts\/37315\/revisions\/86100"}],"wp:attachment":[{"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/media?parent=37315"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/categories?post=37315"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/tags?post=37315"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}