{"id":37465,"date":"2022-11-02T16:32:07","date_gmt":"2023-01-20T00:46:42","guid":{"rendered":"https:\/\/www.silicloud.com\/zh\/blog\/git%e8%bf%99%e4%b8%aa%e4%b8%9c%e8%a5%bf\/"},"modified":"2024-04-28T22:36:51","modified_gmt":"2024-04-28T14:36:51","slug":"git%e8%bf%99%e4%b8%aa%e4%b8%9c%e8%a5%bf","status":"publish","type":"post","link":"https:\/\/www.silicloud.com\/zh\/blog\/git%e8%bf%99%e4%b8%aa%e4%b8%9c%e8%a5%bf\/","title":{"rendered":"Git\u8fd9\u4e2a\u4e1c\u897f"},"content":{"rendered":"

\u8fd9\u662f\u6709\u5173Git\uff08\u5305\u62ecGitHub\uff09\u7684\u4e00\u4e9b\u7b14\u8bb0\u3002<\/p>\n

\u6211\u60f3\u5728GitHub\u4ed3\u5e93\u4e2d\u6dfb\u52a0\/\u5220\u9664\u6807\u7b7e\u3002<\/h2>\n
\r\n\/\/ \u8ffd\u52a0\r\n$ <\/span>git tag {<\/span>tag_name}<\/span>\r\n$ <\/span>git push origin {<\/span>tag_name_a}<\/span> {<\/span>tag_name_b}<\/span>\r\n\r\n\/\/ \u30b3\u30df\u30c3\u30c8\u6307\u5b9a\r\n$ <\/span>git tag {<\/span>tag_name}<\/span> {<\/span>commit_hash}<\/span>\r\n\r\n\/\/ \u524a\u9664\r\n$ <\/span>git tag -d<\/span> {<\/span>tag_name}<\/span>\r\n$ <\/span>git push origin -d<\/span> {<\/span>tag_name_a}<\/span> {<\/span>tag_name_b}<\/span>\r\n\r\n\/\/ \u30ed\u30fc\u30ab\u30eb\u306e\u30bf\u30b0\u30ea\u30b9\u30c8\r\n$ <\/span>git tag -l<\/span>\r\n\r\n\/\/ \u30bf\u30b0\u3092\u6253\u3063\u305f\u30b3\u30df\u30c3\u30c8\u3092\u78ba\u8a8d\r\n$ <\/span>git show {<\/span>commit_id}<\/span>\r\n\r\n\/\/ \u30ea\u30e2\u30fc\u30c8\u306e\u30bf\u30b0\u30ea\u30b9\u30c8(<\/span>commitID\u542b\u3080)<\/span>\r\n$ <\/span>git ls-remote --tags<\/span>\r\n<\/code><\/pre>\n
\u8bf7\u53c2\u8003<\/h3>\n
https:\/\/git-scm.com\/book\/ja\/v1\/Git\u306e\u57fa\u672c-\u30bf\u30b0
\nhttps:\/\/stackoverflow.com\/questions\/25984310\/\u30ea\u30e2\u30fc\u30c8\u30bf\u30b0\u3092\u8868\u793a\u3059\u308b\u65b9\u6cd5<\/p>\n
\u64a4\u9500\u5408\u5e76\u63d0\u4ea4<\/h2>\n
\u5728\u8fdb\u884c\u5408\u5e76\u63d0\u4ea4\u65f6\uff0c\u9700\u8981\u6307\u5b9a\u8981\u56de\u9000\u5230\u54ea\u4e2a\u63d0\u4ea4\uff08\u662f\u4e0a\u4e00\u4e2a\u5408\u5e76\u63d0\u4ea4\u8fd8\u662f\u4e4b\u95f4\u7684\u63d0\u4ea4\uff09\u3002\u8fd9\u53ef\u4ee5\u901a\u8fc7 -m \u9009\u9879\u6765\u6307\u5b9a\u3002<\/p>\n
$ <\/span>git log\r\ncommit <commit_id>\r\nMerge:<1> <2>\r\n$ <\/span>git revert --no-edit<\/span> -m<\/span> 1 <commit_id>\r\n<\/code><\/pre>\n
\u8bf7\u63d0\u4f9b\u66f4\u591a\u7684\u4e0a\u4e0b\u6587\u6216\u53e5\u5b50\u7528\u4e8e\u53c2\u8003\u3002<\/h3>\n
    \n
  • \n
      Git\u3067Merge Commit\u3092Revert\u3059\u308b\u65b9\u6cd5<\/ul>\n<\/li>\n<\/ul>\n
       <\/p>\n
        \n
      • \n
          git revert \u3067\u8907\u6570\u30b3\u30df\u30c3\u30c8\u3092\u6253\u3061\u6d88\u3059<\/ul>\n<\/li>\n<\/ul>\n
           <\/p>\n
            \u3010 git revert \u3011\u30b3\u30de\u30f3\u30c9<\/ul>\n
            \u6211\u60f3\u8981\u5c06\u5de5\u4f5c\u76ee\u5f55\u5207\u6362\u5230\u7279\u5b9a\u7684\u63d0\u4ea4\u3002<\/h2>\n
            $ <\/span>git checkout <SHA>\r\n<\/code><\/pre>\n
            \u8bf7\u67e5\u9605<\/h3>\n
              \u30b3\u30df\u30c3\u30c8\u3092\u6307\u5b9a\u3057\u3066\u30c1\u30a7\u30c3\u30af\u30a2\u30a6\u30c8\u3059\u308b<\/ul>\n
              \u6211\u60f3\u8981\u5c06\u5b50\u6a21\u5757\u66f4\u65b0\u4e3a\u8fdc\u7a0b\u5206\u652f\u7684\u5185\u5bb9<\/h2>\n
              \u5728\u514b\u9686\u5305\u542b\u5b50\u6a21\u5757\u7684\u7279\u5b9a\u4ed3\u5e93\u4e4b\u540e\u7684\u60c5\u51b5\u4e0b\u3002
              \n\u5f53\u6267\u884cgit submodule add\u65f6\uff0c\u8fd9\u4e2a\u64cd\u4f5c\u4e0d\u4f1a\u5728\u63d0\u4ea4\u4e2d\u4f53\u73b0\u51fa\u6765\uff0c\u6240\u4ee5\u53ef\u4ee5\u5207\u6362\u5230\u4e00\u4e2a\u65b0\u5206\u652f\u8fdb\u884c\u64cd\u4f5c\uff0c\u8fd9\u6837\u5c31\u53ef\u4ee5\u5728\u5386\u53f2\u8bb0\u5f55\u4e2d\u4fdd\u7559\u4e0b\u6765\u3002<\/p>\n
              \r\n\/\/ \u5bfe\u8c61submodule\u306e\u767b\u9332\r\n$ <\/span>git submodule add git@github.com:{<\/span>user_name}<\/span>\/{<\/span>repository_name}<\/span>.git {<\/span>dirctory_name}<\/span>\r\n'dirctory_name'<\/span> already exists in <\/span>the index\r\n\r\n\/\/ \u4e00\u5ea6\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u3092\u30a2\u30f3\u30b9\u30c6\u30fc\u30b8\u3059\u308b\u5fc5\u8981\u6027\u304c\u3042\u308b\u3089\u3057\u3044\r\n$ <\/span>git rm<\/span> -r<\/span> {<\/span>dirctory_name}<\/span>\r\n\r\n\/\/ \u518d\u5ea6\u767b\u9332\r\n$ <\/span>git submodule add git@github.com:{<\/span>user_name}<\/span>\/{<\/span>repository_name}<\/span>.git {<\/span>dirctory_name}<\/span>\r\n<\/code><\/pre>\n
              \u5c06\u6240\u6709\u7684\u5dee\u5f02\u5408\u5e76\u5230 master \u4e0a\u3002<\/h2>\n
              $ <\/span>git pull origin master\r\n$ <\/span>git checkout -b<\/span> branch-b\r\n$ <\/span>git rebase master\r\n$ <\/span>git checkout --ours<\/span> <filename>\r\n$ <\/span>git rebase --continue<\/span>\r\n<\/code><\/pre>\n
              \u6211\u5e0c\u671b\u5f97\u5230\u4e00\u4e2a\u6587\u4ef6\u5217\u8868\u6765\u663e\u793a\u53d8\u66f4\u5dee\u5f02\u3002<\/h2>\n
              $ <\/span>git log --name-only<\/span>\r\n<\/code><\/pre>\n
              \u60f3\u8981\u56de\u6edagit\u64cd\u4f5c<\/h2>\n
              $ <\/span>git reflog\r\n$ <\/span>git reset --hard<\/span> HEAD@{<\/span>5}<\/span>\r\n<\/code><\/pre>\n
              \u6211\u60f3\u83b7\u53d6\u5df2\u66f4\u6539\u7684\u6587\u4ef6\u5217\u8868\u3002<\/h2>\n
              $ <\/span>git log --name-only<\/span> \r\n\r\n$ <\/span>git log --name-only<\/span> --oneline<\/span>\r\n<\/code><\/pre>\n","protected":false},"excerpt":{"rendered":"
              \u8fd9\u662f\u6709\u5173Git\uff08\u5305\u62ecGitHub\uff09\u7684\u4e00\u4e9b\u7b14\u8bb0\u3002 \u6211\u60f3\u5728GitHub\u4ed3\u5e93\u4e2d\u6dfb\u52a0\/\u5220\u9664\u6807\u7b7e\u3002 \/\/ \u8ffd\u52a0 $ gi […]<\/p>\n","protected":false},"author":6,"featured_media":0,"comment_status":"closed","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"footnotes":""},"categories":[1],"tags":[],"class_list":["post-37465","post","type-post","status-publish","format-standard","hentry","category-uncategorized"],"yoast_head":"\nGit\u8fd9\u4e2a\u4e1c\u897f - 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\u8fd9\u4e2a\u4e1c\u897f\/\" \/>\n<meta property=\"og:locale\" content=\"zh_CN\" \/>\n<meta property=\"og:type\" content=\"article\" \/>\n<meta property=\"og:title\" content=\"Git\u8fd9\u4e2a\u4e1c\u897f\" \/>\n<meta property=\"og:description\" content=\"\u8fd9\u662f\u6709\u5173Git\uff08\u5305\u62ecGitHub\uff09\u7684\u4e00\u4e9b\u7b14\u8bb0\u3002 \u6211\u60f3\u5728GitHub\u4ed3\u5e93\u4e2d\u6dfb\u52a0\/\u5220\u9664\u6807\u7b7e\u3002 \/\/ \u8ffd\u52a0 $ gi […]\" \/>\n<meta property=\"og:url\" content=\"https:\/\/www.silicloud.com\/zh\/blog\/git\u8fd9\u4e2a\u4e1c\u897f\/\" \/>\n<meta property=\"og:site_name\" content=\"Blog - Silicon Cloud\" \/>\n<meta property=\"article:published_time\" content=\"2023-01-20T00:46:42+00:00\" \/>\n<meta property=\"article:modified_time\" content=\"2024-04-28T14:36:51+00:00\" \/>\n<meta name=\"author\" content=\"\u6587, \u7fd4\" \/>\n<meta name=\"twitter:card\" content=\"summary_large_image\" \/>\n<meta name=\"twitter:label1\" content=\"\u4f5c\u8005\" \/>\n\t<meta name=\"twitter:data1\" content=\"\u6587, \u7fd4\" \/>\n\t<meta name=\"twitter:label2\" content=\"\u9884\u8ba1\u9605\u8bfb\u65f6\u95f4\" \/>\n\t<meta name=\"twitter:data2\" content=\"1 \u5206\" \/>\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%e8%bf%99%e4%b8%aa%e4%b8%9c%e8%a5%bf\/\",\"url\":\"https:\/\/www.silicloud.com\/zh\/blog\/git%e8%bf%99%e4%b8%aa%e4%b8%9c%e8%a5%bf\/\",\"name\":\"Git\u8fd9\u4e2a\u4e1c\u897f - Blog - Silicon Cloud\",\"isPartOf\":{\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/#website\"},\"datePublished\":\"2023-01-20T00:46:42+00:00\",\"dateModified\":\"2024-04-28T14:36:51+00:00\",\"author\":{\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/64d5cc7727fffbff2f9a2a8da1de3e5c\"},\"breadcrumb\":{\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/git%e8%bf%99%e4%b8%aa%e4%b8%9c%e8%a5%bf\/#breadcrumb\"},\"inLanguage\":\"zh-Hans\",\"potentialAction\":[{\"@type\":\"ReadAction\",\"target\":[\"https:\/\/www.silicloud.com\/zh\/blog\/git%e8%bf%99%e4%b8%aa%e4%b8%9c%e8%a5%bf\/\"]}]},{\"@type\":\"BreadcrumbList\",\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/git%e8%bf%99%e4%b8%aa%e4%b8%9c%e8%a5%bf\/#breadcrumb\",\"itemListElement\":[{\"@type\":\"ListItem\",\"position\":1,\"name\":\"\u9996\u9875\",\"item\":\"https:\/\/www.silicloud.com\/zh\/blog\/\"},{\"@type\":\"ListItem\",\"position\":2,\"name\":\"Git\u8fd9\u4e2a\u4e1c\u897f\"}]},{\"@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\/64d5cc7727fffbff2f9a2a8da1de3e5c\",\"name\":\"\u6587, \u7fd4\",\"image\":{\"@type\":\"ImageObject\",\"inLanguage\":\"zh-Hans\",\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/image\/\",\"url\":\"https:\/\/secure.gravatar.com\/avatar\/920c3d673e0bccacc98e5e6b7149bb3c22edd8d39cb753e5d7d7e471498118a1?s=96&d=mm&r=g\",\"contentUrl\":\"https:\/\/secure.gravatar.com\/avatar\/920c3d673e0bccacc98e5e6b7149bb3c22edd8d39cb753e5d7d7e471498118a1?s=96&d=mm&r=g\",\"caption\":\"\u6587, \u7fd4\"},\"url\":\"https:\/\/www.silicloud.com\/zh\/blog\/author\/wenxiang\/\"},{\"@type\":\"ImageObject\",\"inLanguage\":\"zh-Hans\",\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/git%e8%bf%99%e4%b8%aa%e4%b8%9c%e8%a5%bf\/#local-main-organization-logo\",\"url\":\"\",\"contentUrl\":\"\",\"caption\":\"Blog - Silicon Cloud\"}]}<\/script>\n<!-- \/ Yoast SEO Premium plugin. -->","yoast_head_json":{"title":"Git\u8fd9\u4e2a\u4e1c\u897f - 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\u8fd9\u4e2a\u4e1c\u897f\/","og_locale":"zh_CN","og_type":"article","og_title":"Git\u8fd9\u4e2a\u4e1c\u897f","og_description":"\u8fd9\u662f\u6709\u5173Git\uff08\u5305\u62ecGitHub\uff09\u7684\u4e00\u4e9b\u7b14\u8bb0\u3002 \u6211\u60f3\u5728GitHub\u4ed3\u5e93\u4e2d\u6dfb\u52a0\/\u5220\u9664\u6807\u7b7e\u3002 \/\/ \u8ffd\u52a0 $ gi […]","og_url":"https:\/\/www.silicloud.com\/zh\/blog\/git\u8fd9\u4e2a\u4e1c\u897f\/","og_site_name":"Blog - Silicon Cloud","article_published_time":"2023-01-20T00:46:42+00:00","article_modified_time":"2024-04-28T14:36:51+00:00","author":"\u6587, \u7fd4","twitter_card":"summary_large_image","twitter_misc":{"\u4f5c\u8005":"\u6587, \u7fd4","\u9884\u8ba1\u9605\u8bfb\u65f6\u95f4":"1 \u5206"},"schema":{"@context":"https:\/\/schema.org","@graph":[{"@type":"WebPage","@id":"https:\/\/www.silicloud.com\/zh\/blog\/git%e8%bf%99%e4%b8%aa%e4%b8%9c%e8%a5%bf\/","url":"https:\/\/www.silicloud.com\/zh\/blog\/git%e8%bf%99%e4%b8%aa%e4%b8%9c%e8%a5%bf\/","name":"Git\u8fd9\u4e2a\u4e1c\u897f - Blog - Silicon Cloud","isPartOf":{"@id":"https:\/\/www.silicloud.com\/zh\/blog\/#website"},"datePublished":"2023-01-20T00:46:42+00:00","dateModified":"2024-04-28T14:36:51+00:00","author":{"@id":"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/64d5cc7727fffbff2f9a2a8da1de3e5c"},"breadcrumb":{"@id":"https:\/\/www.silicloud.com\/zh\/blog\/git%e8%bf%99%e4%b8%aa%e4%b8%9c%e8%a5%bf\/#breadcrumb"},"inLanguage":"zh-Hans","potentialAction":[{"@type":"ReadAction","target":["https:\/\/www.silicloud.com\/zh\/blog\/git%e8%bf%99%e4%b8%aa%e4%b8%9c%e8%a5%bf\/"]}]},{"@type":"BreadcrumbList","@id":"https:\/\/www.silicloud.com\/zh\/blog\/git%e8%bf%99%e4%b8%aa%e4%b8%9c%e8%a5%bf\/#breadcrumb","itemListElement":[{"@type":"ListItem","position":1,"name":"\u9996\u9875","item":"https:\/\/www.silicloud.com\/zh\/blog\/"},{"@type":"ListItem","position":2,"name":"Git\u8fd9\u4e2a\u4e1c\u897f"}]},{"@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\/64d5cc7727fffbff2f9a2a8da1de3e5c","name":"\u6587, \u7fd4","image":{"@type":"ImageObject","inLanguage":"zh-Hans","@id":"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/image\/","url":"https:\/\/secure.gravatar.com\/avatar\/920c3d673e0bccacc98e5e6b7149bb3c22edd8d39cb753e5d7d7e471498118a1?s=96&d=mm&r=g","contentUrl":"https:\/\/secure.gravatar.com\/avatar\/920c3d673e0bccacc98e5e6b7149bb3c22edd8d39cb753e5d7d7e471498118a1?s=96&d=mm&r=g","caption":"\u6587, \u7fd4"},"url":"https:\/\/www.silicloud.com\/zh\/blog\/author\/wenxiang\/"},{"@type":"ImageObject","inLanguage":"zh-Hans","@id":"https:\/\/www.silicloud.com\/zh\/blog\/git%e8%bf%99%e4%b8%aa%e4%b8%9c%e8%a5%bf\/#local-main-organization-logo","url":"","contentUrl":"","caption":"Blog - Silicon Cloud"}]}},"_links":{"self":[{"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/posts\/37465","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\/6"}],"replies":[{"embeddable":true,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/comments?post=37465"}],"version-history":[{"count":2,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/posts\/37465\/revisions"}],"predecessor-version":[{"id":62169,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/posts\/37465\/revisions\/62169"}],"wp:attachment":[{"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/media?parent=37465"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/categories?post=37465"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/tags?post=37465"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}