{"id":4656,"date":"2022-04-04T17:25:02","date_gmt":"2022-04-04T09:25:02","guid":{"rendered":"https:\/\/wp.chunhsin.idv.tw\/?p=4656"},"modified":"2023-08-03T18:33:44","modified_gmt":"2023-08-03T10:33:44","slug":"%e5%a5%97%e7%94%a8git%e6%8f%90%e4%ba%a4%e5%88%b0%e4%b8%8d%e5%90%8c%e8%b3%87%e6%96%99%e5%a4%be","status":"publish","type":"post","link":"https:\/\/wp.chunhsin.idv.tw\/?p=4656","title":{"rendered":"\u5957\u7528git\u63d0\u4ea4\u5230\u4e0d\u540c\u8cc7\u6599\u593e"},"content":{"rendered":"\n<p>\u4e00\u822c\u57f7\u884cgit cherry-pick\u53ea\u6703\u5957\u7528\u5230\u5c08\u6848\u4e0b\u7684\u76f8\u540c\u8cc7\u6599\u593e\u7684\u76f8\u540c\u6a94\u6848\uff0c<br>\u82e5\u662f\u8981\u5c07\u63d0\u4ea4\u5957\u5230\u4e0d\u540c\u8cc7\u6599\u593e\u4e0b\u7684\u6a94\u6848\uff0c\u9700\u5148\u5c07\u63d0\u4ea4\u5167\u5bb9\u8f49\u6210patch\u6a94\u6848\uff0c<br>\u518d\u8996\u60c5\u6cc1\u4f7f\u7528git am \u6216 patch<\/p>\n\n\n\n<!--more-->\n\n\n\n<h2 class=\"wp-block-heading\">\u7522\u751fpatch<\/h2>\n\n\n\n<pre class=\"wp-block-code\"><code>git format-patch &#91;--relative=&lt;path&gt;] &lt;committish&gt; &#91;--stdout &gt; &lt;patch-file&gt;]<\/code><\/pre>\n\n\n\n<p>\u5176\u4e2d<\/p>\n\n\n\n<ul class=\"wp-block-list\">\n<li>&#8211;relative\u662f\u70ba\u9650\u5236patch\u7bc4\u570d\u5728\u67d0\u500b\u5b50\u8cc7\u6599\u593e\u4e0b\uff0c\u4f8b\u5982\u50c5\u91dd\u5c0d\u5c08\u6848\u4e0b\u7684images\u7684\u4fee\u6539\uff0c\u5c31\u8a2d\u5b9a&#8211;relative=images \u6216 &#8211;relative images\uff0c\u800c\u62bd\u51fa\u7684patch\u6a94\u88e1\uff0c\u539f\u59cb\u63d0\u4ea4\u7684images\u8def\u5f91\u5c31\u6703\u88ab\u79fb\u9664\u3002<\/li>\n\n\n\n<li>&lt;committish&gt;\u662f\u63d0\u4ea4\u7684\u7bc4\u570d\uff0c\u4f8b\u5982head^\u6216hash1..hash2<\/li>\n\n\n\n<li>&#8211;stdout\u662f\u70ba\u4e86\u5c07\u63d0\u4ea4\u5167\u5bb9\u986f\u793a\u5728\u87a2\u5e55\u4e0a\uff0c\u7136\u5f8c\u518d\u900f\u904e &gt; &lt;patch-file&gt;\u5c07\u6a19\u6e96\u8f38\u51fa\u8f49\u6210\u6307\u5b9a\u7684patch\u6a94\u6848\uff0c\u82e5\u4e0d\u6307\u5b9a &#8211;stdout \uff0cgit format-patch\u5247\u6703\u5c07\u6bcf\u500b\u63d0\u4ea4\u7522\u751f\u500b\u5225\u7684patch\u6a94\u6848<\/li>\n<\/ul>\n\n\n\n<h2 class=\"wp-block-heading\">\u5957\u7528PATCH\u5230\u4e0d\u540c\u8cc7\u6599\u593e\u7684\u4e0d\u540c\u6a94\u6848<\/h2>\n\n\n\n<pre class=\"wp-block-code\"><code> patch &#91;--directory=&lt;dir&gt;] &lt; &lt;patch-file&gt;<\/code><\/pre>\n\n\n\n<p>\u4e0a\u8ff0\u6307\u4ee4\u6703\u5c07&lt;patch-file&gt;\u5957\u5230\u6307\u5b9a\u7684&lt;dir&gt;\u4e0b\uff0c\u5982\u679c\u662f\u540c\u5c64\u8cc7\u6599\u593e\u53ef\u7701\u7565&#8211;directory\u3002\u5982\u679c&lt;patch-file&gt;\u5957\u5230\u7684\u662f\u76f8\u540c\u6a94\u540d\u7684\u6a94\u6848\uff0c\u5247\u6703\u76f4\u63a5\u5957\u7528\uff0c\u82e5\u4e0d\u5b58\u5728\u8207patch\u540c\u540d\u7684\u6a94\u6848\uff0cpatch\u6703\u7b49\u5f85\u8f38\u5165\u6a94\u540d\u5957\u7528\uff0c\u898b\u4e0b\u5716\u7d05\u6846\u8655\uff0c\u8acb\u81ea\u884c\u6307\u5b9a\u8981\u5957\u7528\u7684\u6a94\u540d\u3002<\/p>\n\n\n\n<figure class=\"wp-block-image size-full\"><a href=\"https:\/\/wp.chunhsin.idv.tw\/wp-content\/uploads\/2022\/04\/f1.png\"><img loading=\"lazy\" decoding=\"async\" width=\"901\" height=\"538\" src=\"https:\/\/wp.chunhsin.idv.tw\/wp-content\/uploads\/2022\/04\/f1.png\" alt=\"\" class=\"wp-image-4662\" srcset=\"https:\/\/wp.chunhsin.idv.tw\/wp-content\/uploads\/2022\/04\/f1.png 901w, https:\/\/wp.chunhsin.idv.tw\/wp-content\/uploads\/2022\/04\/f1-300x179.png 300w, https:\/\/wp.chunhsin.idv.tw\/wp-content\/uploads\/2022\/04\/f1-768x459.png 768w\" sizes=\"auto, (max-width: 709px) 85vw, (max-width: 909px) 67vw, (max-width: 1362px) 62vw, 840px\" \/><\/a><\/figure>\n\n\n\n<h2 class=\"wp-block-heading\">\u5957\u7528PATCH\u5230\u4e0d\u540c\u8cc7\u6599\u593e\u7684\u76f8\u540c\u6a94\u6848<\/h2>\n\n\n\n<pre class=\"wp-block-code\"><code>git am &#91;--3way] &#91;--directory=&lt;dir&gt;] &lt;patch-file&gt;<\/code><\/pre>\n\n\n\n<p>git am\u53ef\u6307\u5b9a\u4e0d\u540c\u8cc7\u6599\u593e\u5957\u7528patch\uff0c\u4f46\u5fc5\u9808\u662f\u76f8\u540c\u6a94\u540d<s>\uff0c\u800c\u4e14\u6a94\u6848\u7684\u72c0\u614b\u5fc5\u9808\u8207patch\u524d\u7684\u72c0\u614b\u4e00\u6a21\u4e00\u6a23\uff0c\u5426\u5247\u9810\u8a2d\u72c0\u614b\u4e0b\u662f\u4e0d\u6703\u5957\u7528patch<\/s>\u3002<strong>\u5982\u679c\u6a94\u6848\u72c0\u614b\u4e0d\u4e00\u6a23\uff0c\u53ef\u4ee5\u52a0\u4e0a&#8211;3way\u53c3\u6578\uff0cgit\u6703\u5617\u8a66\u5c07\u63d0\u4ea4\u5957\u5230\u6307\u5b9a\u6a94\u6848\u3002<\/strong><\/p>\n\n\n\n<h2 class=\"wp-block-heading\">\u5dee\u7570<\/h2>\n\n\n\n<p>patch\u6307\u4ee4\u6703\u5c07patch\u6a94\u5957\u5230\u6a94\u6848\uff0c\u4f46\u4e0d\u6703\u76f4\u63a5\u5efa\u7acb\u63d0\u4ea4\uff0cgit am\u5247\u5728\u5957\u7528patch\u4e4b\u5f8c\u76f4\u63a5\u5efa\u7acb\u63d0\u4ea4\u3002<\/p>\n\n\n\n<h2 class=\"wp-block-heading\">\u7d50\u8ad6<\/h2>\n\n\n\n<p>\u7121\u8ad6patch \u6216 git am\uff0c\u82e5\u662f\u8981\u5c07 patch\u6a94\u5957\u5230\u73fe\u5b58\u6a94\u6848\uff0c\u6a94\u6848\u7684\u5167\u5bb9\u5fc5\u9808\u548cpatch\u6a94\u7684\u88e1\u7684\u7d50\u69cb\u76f8\u4f3c\uff0c\u4e0d\u7136\u662f\u5957\u4e0d\u904e\u53bb\u7684\uff0c\u96d6\u7136\u5169\u8005\u90fd\u53ef\u4ee5\u52a0\u4e0a&#8211;reject\uff0c\u5957\u7528\u9069\u7528\u7684patch\u4e26\u5c07\u4e0d\u9069\u7528\u7684patch\u8f38\u51fa\u6210.rej\u6a94\u6848\uff0c\u4e26\u653e\u5728\u76ee\u7684\u5c08\u6848\u4e0b\uff0c\u4f46\u82e5\u8981\u5957\u7528\u7684patch\u7d55\u5927\u90e8\u4efd\u90fd\u4e0d\u76f8\u5bb9\uff0c\u4e0a\u8ff0\u7684\u64cd\u4f5c\u61c9\u8a72\u4e5f\u7121\u6cd5\u5e36\u4f86\u4ec0\u9ebc\u597d\u8655\uff0c\u76f4\u63a5\u7528\u6bd4\u5c0d\u5de5\u5177\u4f86\u8655\u7406\u53ef\u80fd\u9084\u6bd4\u8f03\u9069\u5408\u3002<\/p>\n\n\n\n<p>\u4e0d\u904e\u5982\u679c\u9700\u8981\u5957\u7528patch\u7684\u6a94\u6848\u6578\u91cf\u5f88\u591a\uff0c\u4e5f\u8a31\u8a66\u8a66\u770b\u4e5f\u7121\u59a8\uff0c\u53cd\u6b63\u4e5f\u6c92\u6709\u66f4\u6709\u6548\u7684\u65b9\u6cd5\u4e86\u3002<\/p>\n\n\n\n<hr class=\"wp-block-separator has-alpha-channel-opacity\"\/>\n\n\n\n<p>\u65b0\u589e\u65bc2023\/08\/03<\/p>\n\n\n\n<p>\u4eca\u5929\u7d42\u65bc\u6ce8\u610f\u5230git am\u9084\u6709\u500b&#8211;3way\u9078\u9805\u53ef\u4ee5\u7528\uff0c\u9019\u6a23\u4e00\u4f86\uff0c\u5176\u4ed6\u8cc7\u6599\u593e\u4e0b\u7684\u6a94\u6848\u5c31\u4e0d\u9700\u8981\u7dad\u6301\u76f8\u540c\u72c0\u614b\u4e86(\u5c31\u662f\u63d0\u4ea4\u4fee\u6539\u8655\u7684\u524d\u5f8c\u4e09\u884c\u7684\u7bc4\u570d\u8981\u4e00\u6a21\u4e00\u6a23)\u3002<\/p>\n","protected":false},"excerpt":{"rendered":"<p>\u4e00\u822c\u57f7\u884cgit cherry-pick\u53ea\u6703\u5957\u7528\u5230\u5c08\u6848\u4e0b\u7684\u76f8\u540c\u8cc7\u6599\u593e\u7684\u76f8\u540c\u6a94\u6848\uff0c\u82e5\u662f\u8981\u5c07\u63d0\u4ea4\u5957\u5230\u4e0d\u540c\u8cc7\u6599\u593e\u4e0b\u7684\u6a94 &hellip; <a href=\"https:\/\/wp.chunhsin.idv.tw\/?p=4656\" class=\"more-link\">\u95b1\u8b80\u5168\u6587<span class=\"screen-reader-text\">\u3008\u5957\u7528git\u63d0\u4ea4\u5230\u4e0d\u540c\u8cc7\u6599\u593e\u3009<\/span><\/a><\/p>\n","protected":false},"author":1,"featured_media":0,"comment_status":"open","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"footnotes":""},"categories":[343,12],"tags":[318,395,394],"class_list":{"0":"post-4656","1":"post","2":"type-post","3":"status-publish","4":"format-standard","5":"hentry","6":"category-git","7":"category-freetalking","8":"tag-git","10":"tag-patch"},"_links":{"self":[{"href":"https:\/\/wp.chunhsin.idv.tw\/index.php?rest_route=\/wp\/v2\/posts\/4656","targetHints":{"allow":["GET"]}}],"collection":[{"href":"https:\/\/wp.chunhsin.idv.tw\/index.php?rest_route=\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/wp.chunhsin.idv.tw\/index.php?rest_route=\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/wp.chunhsin.idv.tw\/index.php?rest_route=\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"https:\/\/wp.chunhsin.idv.tw\/index.php?rest_route=%2Fwp%2Fv2%2Fcomments&post=4656"}],"version-history":[{"count":17,"href":"https:\/\/wp.chunhsin.idv.tw\/index.php?rest_route=\/wp\/v2\/posts\/4656\/revisions"}],"predecessor-version":[{"id":4864,"href":"https:\/\/wp.chunhsin.idv.tw\/index.php?rest_route=\/wp\/v2\/posts\/4656\/revisions\/4864"}],"wp:attachment":[{"href":"https:\/\/wp.chunhsin.idv.tw\/index.php?rest_route=%2Fwp%2Fv2%2Fmedia&parent=4656"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/wp.chunhsin.idv.tw\/index.php?rest_route=%2Fwp%2Fv2%2Fcategories&post=4656"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/wp.chunhsin.idv.tw\/index.php?rest_route=%2Fwp%2Fv2%2Ftags&post=4656"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}