{"id":37556,"date":"2023-10-01T14:30:34","date_gmt":"2022-12-28T18:08:57","guid":{"rendered":"https:\/\/www.silicloud.com\/zh\/blog\/%e5%9c%a8git%e4%b8%8a%e7%a1%ae%e8%ae%a4\/"},"modified":"2024-05-04T02:23:33","modified_gmt":"2024-05-03T18:23:33","slug":"%e5%9c%a8git%e4%b8%8a%e7%a1%ae%e8%ae%a4","status":"publish","type":"post","link":"https:\/\/www.silicloud.com\/zh\/blog\/%e5%9c%a8git%e4%b8%8a%e7%a1%ae%e8%ae%a4\/","title":{"rendered":"\u5728Git\u4e0a\u786e\u8ba4"},"content":{"rendered":"<p>\u56e0\u4e3aFreeBSD 12.0\u7684\u53d1\u5e03\u63a5\u8fd1\u4e86\uff0c\u6240\u4ee5\u6211\u6b63\u5728\u505a\u4e00\u4e9b\u786e\u8ba4\u5de5\u4f5c\u3002FreeBSD\u7684\u4e3b\u8981\u6e90\u4ee3\u7801\u7ba1\u7406\u7cfb\u7edf\u662fSVN\uff0c\u4f46\u6211\u4e5f\u5728github\u4e0a\u6709\u4e00\u4e2a\u526f\u672c\uff0c\u6240\u4ee5\u6211\u4f7f\u7528git\u8fdb\u884c\u64cd\u4f5c\u3002<\/p>\n<p>\u8fd9\u4e2a\u8ba1\u5212\u7684\u8fdb\u5c55\u4f3c\u4e4e\u662f\u8fd9\u6837\u7684\u3002<\/p>\n<div><img decoding=\"async\" class=\"post-images\" title=\"\" src=\"https:\/\/cdn.silicloud.com\/blog-img\/blog\/img\/657d2f4837434c4406c57789\/2-0.png\" alt=\"12-CURRENT.png\" \/><\/div>\n<p>\u5728FreeBSD\u4e2d\uff0c\u4fee\u6b63\u4f1a\u88ab\u653e\u5165head\u5e76\u8fdb\u884c\u5408\u5e76\uff0c\u7136\u540e\u5c06\u5176\u53cd\u6620\u5230\u6bcf\u4e2a\u5206\u652f\u3002\uff08\u5728FreeBSD\u4e2d\uff0c\u4fee\u6b63\u4f1a\u88ab\u653e\u5165\u4e3b\u5206\u652f\u5e76\u5408\u5e76\u5230\u5f53\u524d\u5206\u652f\u4ee5\u53cd\u6620\u5728\u6bcf\u4e2a\u5206\u652f\u4e0a\u3002\uff09<\/p>\n<p>\u5982\u679c\u60a8\u60f3\u6784\u5efa\u5305\u62ec\u5c1a\u672a\u7ecf\u8fc7\u5ba1\u6838\u7684\u6e90\u4ee3\u7801\u548c\u79c1\u6709\u6e90\u4ee3\u7801\u5728\u5185\u7684\u7248\u672c\uff0c\u60a8\u53ef\u4ee5\u6309\u7167\u4ee5\u4e0b\u65b9\u5f0f\u64cd\u4f5c\u3002\u4f46\u662f\uff0c\u5bf9\u4e8e\u572812-CURRENT\u7248\u672c\u4e0a\u8fdb\u884c\u8fc7\u5ba1\u6838\u5e76\u5df2\u5408\u5e76\u5230head(master)\u7684\u4ee3\u7801\uff0c\u53ef\u4ee5\u76f4\u63a5\u4f7f\u7528stable\/12\u5206\u652f\u8fdb\u884c\u6784\u5efa\u3002<\/p>\n<p>\u53cd\u6620\u6b63\u5728\u5ba1\u67e5\u4e2d\u7684\u7269\u54c1\u3002<\/p>\n<pre class=\"post-pre\"><code>% arc export --revision D13583 --git | patch\u3000-V none\r\n<\/code><\/pre>\n<p>\u4ece\u5176\u4ed6\u5206\u652f\u5408\u5e76<\/p>\n<pre class=\"post-pre\"><code>% git checkout zrouter -- sys\/geom\/geom_flashmap.c\r\n<\/code><\/pre>\n<p>\u901a\u8fc7\u4e0a\u8ff0\u64cd\u4f5c\uff0c\u4f1a\u5f97\u5230\u4ee5\u4e0b\u72b6\u6001\u3002<\/p>\n<pre class=\"post-pre\"><code>% git status\r\nOn branch stable\/12\r\nYour branch is up to date with 'upstream\/stable\/12'.\r\n\r\nChanges to be committed:\r\n  (use \"git reset HEAD &lt;file&gt;...\" to unstage)\r\n\r\n        modified:   sys\/geom\/geom_flashmap.c\r\n\r\nChanges not staged for commit:\r\n  (use \"git add &lt;file&gt;...\" to update what will be committed)\r\n  (use \"git checkout -- &lt;file&gt;...\" to discard changes in working directory)\r\n\r\n        modified:   sys\/conf\/options\r\n        modified:   sys\/fs\/tmpfs\/tmpfs.h\r\n        modified:   sys\/fs\/tmpfs\/tmpfs_vfsops.c\r\n\r\n<\/code><\/pre>\n<p>\u6784\u5efa\u8fd9\u4e2a\u6811\u65f6\uff0c\u5728\u542f\u52a8\u65f6\u4f1a\u663e\u793a\u4e3a&#8221;\u810f&#8221;\u72b6\u6001\u3002<\/p>\n<pre class=\"post-pre\"><code>FreeBSD 12.0-BETA4 #0 e78279655eb(stable\/12)-dirty\r\n<\/code><\/pre>\n<p>\u8fd8\u539f\u7684\u65b9\u6cd5\u5982\u4e0b\u3002\u5982\u679c\u4f7f\u7528checkout\u547d\u4ee4\uff0c\u4f3c\u4e4e\u65e0\u6cd5\u5c06\u5176\u4ed6\u5206\u652f\u5e26\u56de\u3002<\/p>\n<pre class=\"post-pre\"><code>% git reset --hard HEAD\r\n<\/code><\/pre>\n<p>\u4e0a\u8ff0\u7684\u4e24\u4e2a\u8865\u4e01\u662f\u4e3a\u4e86\u8fdb\u884c\u8fdc\u7a0b\u66f4\u65b0\u800c\u51c6\u5907\u7684\u3002\u4e00\u4e2a\u662f\u4e3a\u4e86\u7ed5\u8fc7tmpfs\u5927\u5c0f\u7684\u68c0\u67e5\u800c\u8bbe\u8ba1\u7684\u89e3\u51b3\u65b9\u6848\uff0c\u53e6\u4e00\u4e2a\u662f\u7528\u4e8e\u4ecedts\u7684\u5206\u533a\u6620\u5c04\u4e2d\u627e\u5230rootfs\u7684\u56fa\u4ef6\u7684\u8865\u4e01\u3002\u901a\u8fc7\u4f7f\u7528\u8fd9\u4e9b\u8865\u4e01\uff0c\u53ef\u4ee5\u987a\u5229\u8fdb\u884c\u8fdc\u7a0b\u66f4\u65b0\uff0c\u5e76\u4e14\u53ef\u4ee5\u8f7b\u677e\u8fdb\u884c\u786e\u8ba4\u3002<\/p>\n","protected":false},"excerpt":{"rendered":"<p>\u56e0\u4e3aFreeBSD 12.0\u7684\u53d1\u5e03\u63a5\u8fd1\u4e86\uff0c\u6240\u4ee5\u6211\u6b63\u5728\u505a\u4e00\u4e9b\u786e\u8ba4\u5de5\u4f5c\u3002FreeBSD\u7684\u4e3b\u8981\u6e90\u4ee3\u7801\u7ba1\u7406\u7cfb\u7edf\u662fSVN [&hellip;]<\/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-37556","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>\u5728Git\u4e0a\u786e\u8ba4 - 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\/\u5728git\u4e0a\u786e\u8ba4\/\" \/>\n<meta property=\"og:locale\" content=\"zh_CN\" \/>\n<meta property=\"og:type\" content=\"article\" \/>\n<meta property=\"og:title\" content=\"\u5728Git\u4e0a\u786e\u8ba4\" \/>\n<meta property=\"og:description\" content=\"\u56e0\u4e3aFreeBSD 12.0\u7684\u53d1\u5e03\u63a5\u8fd1\u4e86\uff0c\u6240\u4ee5\u6211\u6b63\u5728\u505a\u4e00\u4e9b\u786e\u8ba4\u5de5\u4f5c\u3002FreeBSD\u7684\u4e3b\u8981\u6e90\u4ee3\u7801\u7ba1\u7406\u7cfb\u7edf\u662fSVN [&hellip;]\" \/>\n<meta property=\"og:url\" content=\"https:\/\/www.silicloud.com\/zh\/blog\/\u5728git\u4e0a\u786e\u8ba4\/\" \/>\n<meta property=\"og:site_name\" content=\"Blog - Silicon Cloud\" \/>\n<meta property=\"article:published_time\" content=\"2022-12-28T18:08:57+00:00\" \/>\n<meta property=\"article:modified_time\" content=\"2024-05-03T18:23:33+00:00\" \/>\n<meta property=\"og:image\" content=\"https:\/\/cdn.silicloud.com\/blog-img\/blog\/img\/657d2f4837434c4406c57789\/2-0.png\" \/>\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\/%e5%9c%a8git%e4%b8%8a%e7%a1%ae%e8%ae%a4\/\",\"url\":\"https:\/\/www.silicloud.com\/zh\/blog\/%e5%9c%a8git%e4%b8%8a%e7%a1%ae%e8%ae%a4\/\",\"name\":\"\u5728Git\u4e0a\u786e\u8ba4 - Blog - Silicon Cloud\",\"isPartOf\":{\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/#website\"},\"datePublished\":\"2022-12-28T18:08:57+00:00\",\"dateModified\":\"2024-05-03T18:23:33+00:00\",\"author\":{\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/64d5cc7727fffbff2f9a2a8da1de3e5c\"},\"breadcrumb\":{\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/%e5%9c%a8git%e4%b8%8a%e7%a1%ae%e8%ae%a4\/#breadcrumb\"},\"inLanguage\":\"zh-Hans\",\"potentialAction\":[{\"@type\":\"ReadAction\",\"target\":[\"https:\/\/www.silicloud.com\/zh\/blog\/%e5%9c%a8git%e4%b8%8a%e7%a1%ae%e8%ae%a4\/\"]}]},{\"@type\":\"BreadcrumbList\",\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/%e5%9c%a8git%e4%b8%8a%e7%a1%ae%e8%ae%a4\/#breadcrumb\",\"itemListElement\":[{\"@type\":\"ListItem\",\"position\":1,\"name\":\"\u9996\u9875\",\"item\":\"https:\/\/www.silicloud.com\/zh\/blog\/\"},{\"@type\":\"ListItem\",\"position\":2,\"name\":\"\u5728Git\u4e0a\u786e\u8ba4\"}]},{\"@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\/%e5%9c%a8git%e4%b8%8a%e7%a1%ae%e8%ae%a4\/#local-main-organization-logo\",\"url\":\"\",\"contentUrl\":\"\",\"caption\":\"Blog - Silicon Cloud\"}]}<\/script>\n<!-- \/ Yoast SEO Premium plugin. -->","yoast_head_json":{"title":"\u5728Git\u4e0a\u786e\u8ba4 - 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\/\u5728git\u4e0a\u786e\u8ba4\/","og_locale":"zh_CN","og_type":"article","og_title":"\u5728Git\u4e0a\u786e\u8ba4","og_description":"\u56e0\u4e3aFreeBSD 12.0\u7684\u53d1\u5e03\u63a5\u8fd1\u4e86\uff0c\u6240\u4ee5\u6211\u6b63\u5728\u505a\u4e00\u4e9b\u786e\u8ba4\u5de5\u4f5c\u3002FreeBSD\u7684\u4e3b\u8981\u6e90\u4ee3\u7801\u7ba1\u7406\u7cfb\u7edf\u662fSVN [&hellip;]","og_url":"https:\/\/www.silicloud.com\/zh\/blog\/\u5728git\u4e0a\u786e\u8ba4\/","og_site_name":"Blog - Silicon Cloud","article_published_time":"2022-12-28T18:08:57+00:00","article_modified_time":"2024-05-03T18:23:33+00:00","og_image":[{"url":"https:\/\/cdn.silicloud.com\/blog-img\/blog\/img\/657d2f4837434c4406c57789\/2-0.png"}],"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\/%e5%9c%a8git%e4%b8%8a%e7%a1%ae%e8%ae%a4\/","url":"https:\/\/www.silicloud.com\/zh\/blog\/%e5%9c%a8git%e4%b8%8a%e7%a1%ae%e8%ae%a4\/","name":"\u5728Git\u4e0a\u786e\u8ba4 - Blog - Silicon Cloud","isPartOf":{"@id":"https:\/\/www.silicloud.com\/zh\/blog\/#website"},"datePublished":"2022-12-28T18:08:57+00:00","dateModified":"2024-05-03T18:23:33+00:00","author":{"@id":"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/64d5cc7727fffbff2f9a2a8da1de3e5c"},"breadcrumb":{"@id":"https:\/\/www.silicloud.com\/zh\/blog\/%e5%9c%a8git%e4%b8%8a%e7%a1%ae%e8%ae%a4\/#breadcrumb"},"inLanguage":"zh-Hans","potentialAction":[{"@type":"ReadAction","target":["https:\/\/www.silicloud.com\/zh\/blog\/%e5%9c%a8git%e4%b8%8a%e7%a1%ae%e8%ae%a4\/"]}]},{"@type":"BreadcrumbList","@id":"https:\/\/www.silicloud.com\/zh\/blog\/%e5%9c%a8git%e4%b8%8a%e7%a1%ae%e8%ae%a4\/#breadcrumb","itemListElement":[{"@type":"ListItem","position":1,"name":"\u9996\u9875","item":"https:\/\/www.silicloud.com\/zh\/blog\/"},{"@type":"ListItem","position":2,"name":"\u5728Git\u4e0a\u786e\u8ba4"}]},{"@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\/%e5%9c%a8git%e4%b8%8a%e7%a1%ae%e8%ae%a4\/#local-main-organization-logo","url":"","contentUrl":"","caption":"Blog - Silicon Cloud"}]}},"_links":{"self":[{"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/posts\/37556","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=37556"}],"version-history":[{"count":2,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/posts\/37556\/revisions"}],"predecessor-version":[{"id":95541,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/posts\/37556\/revisions\/95541"}],"wp:attachment":[{"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/media?parent=37556"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/categories?post=37556"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/tags?post=37556"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}