{"id":37423,"date":"2023-09-14T12:32:05","date_gmt":"2023-01-16T02:08:40","guid":{"rendered":"https:\/\/www.silicloud.com\/zh\/blog\/%e4%bd%bf%e7%94%a8git%e5%88%87%e6%8d%a2%e5%88%86%e6%94%af\/"},"modified":"2024-05-03T23:42:41","modified_gmt":"2024-05-03T15:42:41","slug":"%e4%bd%bf%e7%94%a8git%e5%88%87%e6%8d%a2%e5%88%86%e6%94%af","status":"publish","type":"post","link":"https:\/\/www.silicloud.com\/zh\/blog\/%e4%bd%bf%e7%94%a8git%e5%88%87%e6%8d%a2%e5%88%86%e6%94%af\/","title":{"rendered":"\u4f7f\u7528git\u5207\u6362\u5206\u652f"},"content":{"rendered":"<p>\u5927\u7ea6\u5728NetBSD 9\u7248\u672c\u7ed3\u675f\u65f6\uff0c\u6211fork\u4e86\u4e00\u4e2aHEAD(trunk)\u5e76\u8fdb\u884c\u4e86\u6211\u7684\u5f00\u53d1\u63d0\u4ea4\uff0c\u5076\u5c14\u4e5f\u4f1a\u4ece\u5b98\u65b9\u5e93\u4e2dpull\u4e00\u4e9b\u66f4\u65b0\u3002\u4f46\u662f\u572810.99.6\u7248\u672c\u540e\uff0c\u51fa\u73b0\u4e86\u5927\u91cf\u51b2\u7a81\u5bfc\u81f4\u65e0\u6cd5\u7ee7\u7eedpull\u3002<\/p>\n<p>\u6211\u8ba4\u4e3a\u53ef\u80fd\u662f\u5728\u5b89\u88c5gcc12\uff08\u4e4b\u524d\u662fgcc10\uff09\u65f6\u51fa\u73b0\u4e86\u95ee\u9898\u3002\u7531\u4e8eNetBSD\u6700\u521d\u662f\u901a\u8fc7Git\u8fdb\u884c\u955c\u50cf\u548c\u901a\u8fc7CVS\u7ba1\u7406\u6e90\u4ee3\u7801\uff0c\u6240\u4ee5\u5076\u5c14\u4f1a\u51fa\u73b0\u5f02\u5e38\u3002<\/p>\n<p>\u7531\u4e8e\u6ca1\u6709\u529e\u6cd5\uff0c\u6211\u51b3\u5b9a\u5148\u56de\u5f52\u5230netbsd-10\u57fa\u7840\u4e0a\u3002\u8fd9\u662f\u56e0\u4e3aHEAD\u5df2\u7ecf\u4f7f\u7528gcc12\uff0c\u53ef\u80fd\u8fd8\u5b58\u5728\u95ee\u9898\u3002\u6ca1\u6709\u5fc5\u8981\u5192\u7740\u98ce\u9669\u53bb\u83b7\u53d6\u9505\u4e2d\u7684\u6817\u5b50\u3002<\/p>\n<p>\u7531\u4e8e\u73b0\u6709\u6587\u4ef6\u6ca1\u6709\u505a\u8fc7\u4fee\u6539\uff0c\u51e0\u4e4e\u90fd\u662f\u65b0\u6587\u4ef6\uff0c\u6240\u4ee5\u53ef\u4ee5\u901a\u8fc7\u590d\u5236\u6587\u4ef6\u8fdb\u884c\u91cd\u5efa\u3002\u4f46\u662f\u4e3a\u4e86\u96be\u5f97\u7684\u673a\u4f1a\uff0c\u6211\u4eec\u6253\u7b97\u4fdd\u7559\u8fc1\u79fb\u7684\u8bb0\u5f55\u63d0\u4ea4\u3002<\/p>\n<p>\u51c6\u5907NetBSD-10\u5206\u652f\u3002<\/p>\n<pre class=\"post-pre\"><code>git remote add upstream https:\/\/github.com\/NetBSD\/src.git\r\ngit fetch upstream\r\ngit checkout -b netbsd-10 upstream\/netbsd-10\r\n<\/code><\/pre>\n<p>\u5728\u539f\u5206\u652f\u4e0a\u521b\u5efa\u81ea\u5df1\u63d0\u4ea4\u7684\u6e05\u5355\u3002\u7531\u4e8e\u65e7\u7684\u5728\u4e0b\u9762\uff0c\u6240\u4ee5\u8fdb\u884c\u53cd\u5411\u6392\u5217\u3002<\/p>\n<pre class=\"post-pre\"><code>git log --author=\"Hiroki Mori\" --pretty=format:%H &gt; \/tmp\/id\r\ntail -r \/tmp\/id &gt; \/tmp\/id.rev\r\n<\/code><\/pre>\n<p>\u7531\u4e8e\u6700\u540e\u4e00\u884c\u6ca1\u6709\u6362\u884c\uff0c\u5bfc\u81f4\u7b2c\u4e00\u884c\u548c\u6700\u540e\u4e00\u884c\u8fde\u5728\u4e00\u8d77\uff0c\u6211\u624b\u52a8\u4fee\u590d\u4e86\u5b83\u3002<\/p>\n<p>\u5c06\u5176\u5e94\u7528\u4e8eNetBSD-10\u5206\u652f\u3002<\/p>\n<pre class=\"post-pre\"><code>cat \/tmp\/id.rev | git cherry-pick --stdin\r\n<\/code><\/pre>\n<p>\u7531\u4e8e\u9519\u8bef\u53d1\u751f\u5728\u6b63\u5728pull\u7684commit\u4e0a\uff0c\u800c\u4e0d\u662f\u5728\u81ea\u5df1\u7684\u4fee\u6b63\u4e0a\uff0c\u6240\u4ee5\u6211\u4eec\u9700\u8981\u56de\u9000\u5e76\u518d\u6b21\u5c1d\u8bd5\u76f4\u5230\u6210\u529f\u3002<\/p>\n<pre class=\"post-pre\"><code>git cherry-pick --abort\r\nvi \/tmp\/id.rev\r\n<\/code><\/pre>\n<p>\u8fd8\u6709\u66f4\u806a\u660e\u7684\u65b9\u6cd5\u3002\u867d\u7136\u6211\u5728\u4f7f\u7528Git\u65f6\u5c3d\u91cf\u907f\u514d\u590d\u6742\u64cd\u4f5c\uff0c\u4f46\u6211\u8fdb\u884c\u4e86\u5404\u79cd\u7814\u7a76\u3002<\/p>\n<p>\u7531\u4e8e\u6784\u5efa\u540eobj\u76ee\u5f55\u4ecd\u7136\u5b58\u5728\u5e76\u5f15\u53d1\u9519\u8bef\uff0c\u56e0\u6b64\u6211\u679c\u65ad\u5220\u9664\u4e86\u5b83\u3002<\/p>\n<pre class=\"post-pre\"><code>find . -type d -name obj -prune -exec rm -rf {} \\;\r\n<\/code><\/pre>\n<p>\u56e0\u4e3a\u770b\u8d77\u6765\u6ca1\u6709\u95ee\u9898\uff0c\u6240\u4ee5\u6211\u5df2\u7ecf\u4e0a\u4f20\u5230GitHub\u4e86\u3002<\/p>\n<pre class=\"post-pre\"><code>git push origin netbsd-10\r\n<\/code><\/pre>\n<p>\u56e0\u4e3a\u4e0a\u5347\u5e26\u5bbd\u5f88\u7a84\uff0c\u6240\u4ee5\u82b1\u4e86\u76f8\u5f53\u957f\u65f6\u95f4\u3002<\/p>\n<p>\u6211\u5728\u5f53\u5929\u7684\u4ea4\u901a\u72b6\u51b5\u4e0b\u51c6\u5907\u4e86\u65e9\u66689\u70b9\u5de6\u53f3\u7684\u5206\u652f\uff0c\u5e76\u572812\u70b9\u540e\u8fdb\u884c\u4e86\u63a8\u9001\u3002<\/p>\n<div><img decoding=\"async\" class=\"post-images\" title=\"\" src=\"https:\/\/cdn.silicloud.com\/blog-img\/blog\/img\/657d2e5637434c4406c5403b\/20-0.png\" alt=\"filename(7).png\" \/><\/div>\n<p>\u53e4\u8001\u7684\u67b6\u6784\u5f00\u53d1\uff0c\u7531\u4e8e\u76f8\u5173\u90e8\u5206\u51e0\u4e4e\u6ca1\u6709\u6539\u52a8\uff0c\u6240\u4ee5\u5728\u5f00\u53d1\u8fc7\u7a0b\u4e2d\u5f88\u5c11\u4f1a\u5f15\u53d1\u51b2\u7a81\uff0c\u8fd9\u662f\u5b83\u7684\u4f18\u70b9\u3002<\/p>\n<p>\u5728\u6b64\u627e\u5230\u6709\u517310\u7684\u53d1\u884c\u7684\u9875\u9762\u3002<\/p>\n<p>&nbsp;<\/p>\n<p>\u5c06\u672c\u5bb6\u7684\u66f4\u65b0\u5408\u5e76\u8fdb\u6765\u7684\u65b9\u6cd5\u5982\u4e0b\u6240\u793a\u3002<\/p>\n<pre class=\"post-pre\"><code>git merge upstream\/netbsd-10\r\n<\/code><\/pre>\n","protected":false},"excerpt":{"rendered":"<p>\u5927\u7ea6\u5728NetBSD 9\u7248\u672c\u7ed3\u675f\u65f6\uff0c\u6211fork\u4e86\u4e00\u4e2aHEAD(trunk)\u5e76\u8fdb\u884c\u4e86\u6211\u7684\u5f00\u53d1\u63d0\u4ea4\uff0c\u5076\u5c14\u4e5f\u4f1a\u4ece\u5b98\u65b9\u5e93 [&hellip;]<\/p>\n","protected":false},"author":5,"featured_media":0,"comment_status":"closed","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"footnotes":""},"categories":[1],"tags":[],"class_list":["post-37423","post","type-post","status-publish","format-standard","hentry","category-uncategorized"],"yoast_head":"<!-- This site is optimized with the Yoast SEO Premium plugin v21.5 (Yoast SEO v21.5) - https:\/\/yoast.com\/wordpress\/plugins\/seo\/ -->\n<title>\u4f7f\u7528git\u5207\u6362\u5206\u652f - 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\/\u4f7f\u7528git\u5207\u6362\u5206\u652f\/\" \/>\n<meta property=\"og:locale\" content=\"zh_CN\" \/>\n<meta property=\"og:type\" content=\"article\" \/>\n<meta property=\"og:title\" content=\"\u4f7f\u7528git\u5207\u6362\u5206\u652f\" \/>\n<meta property=\"og:description\" content=\"\u5927\u7ea6\u5728NetBSD 9\u7248\u672c\u7ed3\u675f\u65f6\uff0c\u6211fork\u4e86\u4e00\u4e2aHEAD(trunk)\u5e76\u8fdb\u884c\u4e86\u6211\u7684\u5f00\u53d1\u63d0\u4ea4\uff0c\u5076\u5c14\u4e5f\u4f1a\u4ece\u5b98\u65b9\u5e93 [&hellip;]\" \/>\n<meta property=\"og:url\" content=\"https:\/\/www.silicloud.com\/zh\/blog\/\u4f7f\u7528git\u5207\u6362\u5206\u652f\/\" \/>\n<meta property=\"og:site_name\" content=\"Blog - Silicon Cloud\" \/>\n<meta property=\"article:published_time\" content=\"2023-01-16T02:08:40+00:00\" \/>\n<meta property=\"article:modified_time\" content=\"2024-05-03T15:42:41+00:00\" \/>\n<meta property=\"og:image\" content=\"https:\/\/cdn.silicloud.com\/blog-img\/blog\/img\/657d2e5637434c4406c5403b\/20-0.png\" \/>\n<meta name=\"author\" content=\"\u6e05, \u5b87\" \/>\n<meta name=\"twitter:card\" content=\"summary_large_image\" \/>\n<meta name=\"twitter:label1\" content=\"\u4f5c\u8005\" \/>\n\t<meta name=\"twitter:data1\" content=\"\u6e05, \u5b87\" \/>\n<script type=\"application\/ld+json\" class=\"yoast-schema-graph\">{\"@context\":\"https:\/\/schema.org\",\"@graph\":[{\"@type\":\"WebPage\",\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/%e4%bd%bf%e7%94%a8git%e5%88%87%e6%8d%a2%e5%88%86%e6%94%af\/\",\"url\":\"https:\/\/www.silicloud.com\/zh\/blog\/%e4%bd%bf%e7%94%a8git%e5%88%87%e6%8d%a2%e5%88%86%e6%94%af\/\",\"name\":\"\u4f7f\u7528git\u5207\u6362\u5206\u652f - Blog - Silicon Cloud\",\"isPartOf\":{\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/#website\"},\"datePublished\":\"2023-01-16T02:08:40+00:00\",\"dateModified\":\"2024-05-03T15:42:41+00:00\",\"author\":{\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/1a6ecd3d914d22a5ac32791ffc1fbd8e\"},\"breadcrumb\":{\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/%e4%bd%bf%e7%94%a8git%e5%88%87%e6%8d%a2%e5%88%86%e6%94%af\/#breadcrumb\"},\"inLanguage\":\"zh-Hans\",\"potentialAction\":[{\"@type\":\"ReadAction\",\"target\":[\"https:\/\/www.silicloud.com\/zh\/blog\/%e4%bd%bf%e7%94%a8git%e5%88%87%e6%8d%a2%e5%88%86%e6%94%af\/\"]}]},{\"@type\":\"BreadcrumbList\",\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/%e4%bd%bf%e7%94%a8git%e5%88%87%e6%8d%a2%e5%88%86%e6%94%af\/#breadcrumb\",\"itemListElement\":[{\"@type\":\"ListItem\",\"position\":1,\"name\":\"\u9996\u9875\",\"item\":\"https:\/\/www.silicloud.com\/zh\/blog\/\"},{\"@type\":\"ListItem\",\"position\":2,\"name\":\"\u4f7f\u7528git\u5207\u6362\u5206\u652f\"}]},{\"@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\/1a6ecd3d914d22a5ac32791ffc1fbd8e\",\"name\":\"\u6e05, \u5b87\",\"image\":{\"@type\":\"ImageObject\",\"inLanguage\":\"zh-Hans\",\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/image\/\",\"url\":\"https:\/\/secure.gravatar.com\/avatar\/4b2016c18459a605fc469c7566608f5686491baa112d0871ee613f61b7210565?s=96&d=mm&r=g\",\"contentUrl\":\"https:\/\/secure.gravatar.com\/avatar\/4b2016c18459a605fc469c7566608f5686491baa112d0871ee613f61b7210565?s=96&d=mm&r=g\",\"caption\":\"\u6e05, \u5b87\"},\"url\":\"https:\/\/www.silicloud.com\/zh\/blog\/author\/qingyu\/\"},{\"@type\":\"ImageObject\",\"inLanguage\":\"zh-Hans\",\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/%e4%bd%bf%e7%94%a8git%e5%88%87%e6%8d%a2%e5%88%86%e6%94%af\/#local-main-organization-logo\",\"url\":\"\",\"contentUrl\":\"\",\"caption\":\"Blog - Silicon Cloud\"}]}<\/script>\n<!-- \/ Yoast SEO Premium plugin. -->","yoast_head_json":{"title":"\u4f7f\u7528git\u5207\u6362\u5206\u652f - 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\/\u4f7f\u7528git\u5207\u6362\u5206\u652f\/","og_locale":"zh_CN","og_type":"article","og_title":"\u4f7f\u7528git\u5207\u6362\u5206\u652f","og_description":"\u5927\u7ea6\u5728NetBSD 9\u7248\u672c\u7ed3\u675f\u65f6\uff0c\u6211fork\u4e86\u4e00\u4e2aHEAD(trunk)\u5e76\u8fdb\u884c\u4e86\u6211\u7684\u5f00\u53d1\u63d0\u4ea4\uff0c\u5076\u5c14\u4e5f\u4f1a\u4ece\u5b98\u65b9\u5e93 [&hellip;]","og_url":"https:\/\/www.silicloud.com\/zh\/blog\/\u4f7f\u7528git\u5207\u6362\u5206\u652f\/","og_site_name":"Blog - Silicon Cloud","article_published_time":"2023-01-16T02:08:40+00:00","article_modified_time":"2024-05-03T15:42:41+00:00","og_image":[{"url":"https:\/\/cdn.silicloud.com\/blog-img\/blog\/img\/657d2e5637434c4406c5403b\/20-0.png"}],"author":"\u6e05, \u5b87","twitter_card":"summary_large_image","twitter_misc":{"\u4f5c\u8005":"\u6e05, \u5b87"},"schema":{"@context":"https:\/\/schema.org","@graph":[{"@type":"WebPage","@id":"https:\/\/www.silicloud.com\/zh\/blog\/%e4%bd%bf%e7%94%a8git%e5%88%87%e6%8d%a2%e5%88%86%e6%94%af\/","url":"https:\/\/www.silicloud.com\/zh\/blog\/%e4%bd%bf%e7%94%a8git%e5%88%87%e6%8d%a2%e5%88%86%e6%94%af\/","name":"\u4f7f\u7528git\u5207\u6362\u5206\u652f - Blog - Silicon Cloud","isPartOf":{"@id":"https:\/\/www.silicloud.com\/zh\/blog\/#website"},"datePublished":"2023-01-16T02:08:40+00:00","dateModified":"2024-05-03T15:42:41+00:00","author":{"@id":"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/1a6ecd3d914d22a5ac32791ffc1fbd8e"},"breadcrumb":{"@id":"https:\/\/www.silicloud.com\/zh\/blog\/%e4%bd%bf%e7%94%a8git%e5%88%87%e6%8d%a2%e5%88%86%e6%94%af\/#breadcrumb"},"inLanguage":"zh-Hans","potentialAction":[{"@type":"ReadAction","target":["https:\/\/www.silicloud.com\/zh\/blog\/%e4%bd%bf%e7%94%a8git%e5%88%87%e6%8d%a2%e5%88%86%e6%94%af\/"]}]},{"@type":"BreadcrumbList","@id":"https:\/\/www.silicloud.com\/zh\/blog\/%e4%bd%bf%e7%94%a8git%e5%88%87%e6%8d%a2%e5%88%86%e6%94%af\/#breadcrumb","itemListElement":[{"@type":"ListItem","position":1,"name":"\u9996\u9875","item":"https:\/\/www.silicloud.com\/zh\/blog\/"},{"@type":"ListItem","position":2,"name":"\u4f7f\u7528git\u5207\u6362\u5206\u652f"}]},{"@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\/1a6ecd3d914d22a5ac32791ffc1fbd8e","name":"\u6e05, \u5b87","image":{"@type":"ImageObject","inLanguage":"zh-Hans","@id":"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/image\/","url":"https:\/\/secure.gravatar.com\/avatar\/4b2016c18459a605fc469c7566608f5686491baa112d0871ee613f61b7210565?s=96&d=mm&r=g","contentUrl":"https:\/\/secure.gravatar.com\/avatar\/4b2016c18459a605fc469c7566608f5686491baa112d0871ee613f61b7210565?s=96&d=mm&r=g","caption":"\u6e05, \u5b87"},"url":"https:\/\/www.silicloud.com\/zh\/blog\/author\/qingyu\/"},{"@type":"ImageObject","inLanguage":"zh-Hans","@id":"https:\/\/www.silicloud.com\/zh\/blog\/%e4%bd%bf%e7%94%a8git%e5%88%87%e6%8d%a2%e5%88%86%e6%94%af\/#local-main-organization-logo","url":"","contentUrl":"","caption":"Blog - Silicon Cloud"}]}},"_links":{"self":[{"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/posts\/37423","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\/5"}],"replies":[{"embeddable":true,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/comments?post=37423"}],"version-history":[{"count":2,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/posts\/37423\/revisions"}],"predecessor-version":[{"id":94812,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/posts\/37423\/revisions\/94812"}],"wp:attachment":[{"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/media?parent=37423"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/categories?post=37423"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/tags?post=37423"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}