{"id":407,"date":"2023-04-08T21:23:04","date_gmt":"2023-04-08T13:23:04","guid":{"rendered":"https:\/\/yajtech.synology.me\/wordpress\/?p=407"},"modified":"2023-04-09T13:03:47","modified_gmt":"2023-04-09T05:03:47","slug":"diff","status":"publish","type":"post","link":"https:\/\/www.yaj.com.tw\/wordpress\/?p=407","title":{"rendered":"diff"},"content":{"rendered":"\n<p>\u6bd4\u8f032\u500b\u8cc7\u6599\u593e\u6216\u6a94\u6848\u7684\u5dee\u7570<\/p>\n\n\n\n<p>diff [\u53c3\u6578][\u6587\u4ef61\u6216\u76ee\u93041][\u6587\u4ef62\u6216\u76ee\u93042]<\/p>\n\n\n\n<p>\u53c3\u6578<\/p>\n\n\n\n<ul class=\"wp-block-list\"><li><code>-<\/code>&nbsp;\u3000\u6307\u5b9a\u8981\u986f\u793a\u591a\u5c11\u884c\u7684\u6587\u672c\u3002\u6b64\u53c3\u6578\u5fc5\u9808\u8207-c\u6216-u\u53c3\u6578\u4e00\u4f75\u4f7f\u7528\u3002<\/li><li><code>-a<\/code>\u6216<code>--text<\/code>&nbsp;diff\u9810\u8a2d\u53ea\u6703\u9010\u884c\u6bd4\u8f03\u6587\u672c\u6587\u4ef6\u3002<\/li><li><code>-b<\/code>\u6216<code>--ignore-space-change<\/code>&nbsp;\u3000\u4e0d\u6aa2\u67e5\u7a7a\u683c\u5b57\u7b26\u7684\u4e0d\u540c\u3002<\/li><li><code>-B<\/code>\u6216<code>--ignore-blank-lines<\/code>&nbsp;\u3000\u4e0d\u6aa2\u67e5\u7a7a\u767d\u884c\u3002<\/li><li><code>-c<\/code>&nbsp;\u3000\u986f\u793a\u5168\u90e8\u5167\u6587\uff0c\u4e26\u6a19\u51fa\u4e0d\u540c\u4e4b\u8655\u3002<\/li><li><code>-C<\/code>\u6216<code>--context<\/code>&nbsp;\u3000\u8207\u57f7\u884c\u300d-c-\u300c\u6307\u4ee4\u76f8\u540c\u3002<\/li><li><code>-d<\/code>\u6216<code>--minimal<\/code>&nbsp;\u3000\u4f7f\u7528\u4e0d\u540c\u7684\u6f14\u7b97\u6cd5\uff0c\u4ee5\u8f03\u5c0f\u7684\u55ae\u4f4d\u4f86\u505a\u6bd4\u8f03\u3002<\/li><li><code>-D<\/code>\u6216<code>ifdef<\/code>&nbsp;\u3000\u6b64\u53c3\u6578\u7684\u8f38\u51fa\u683c\u5f0f\u53ef\u7528\u65bc\u524d\u7f6e\u8655\u7406\u5668\u5de8\u96c6\u3002<\/li><li><code>-e<\/code>\u6216<code>--ed<\/code>&nbsp;\u3000\u6b64\u53c3\u6578\u7684\u8f38\u51fa\u683c\u5f0f\u53ef\u7528\u65bced\u7684script\u6587\u4ef6\u3002<\/li><li><code>-f<\/code>\u6216<code>-forward-ed<\/code>&nbsp;\u3000\u8f38\u51fa\u7684\u683c\u5f0f\u985e\u4f3ced\u7684script\u6587\u4ef6\uff0c\u4f46\u6309\u7167\u539f\u4f86\u6587\u4ef6\u7684\u9806\u5e8f\u4f86\u986f\u793a\u4e0d\u540c\u8655\u3002<\/li><li><code>-H<\/code>\u6216<code>--speed-large-files<\/code>&nbsp;\u3000\u6bd4\u8f03\u5927\u6587\u4ef6\u6642\uff0c\u53ef\u52a0\u5feb\u901f\u5ea6\u3002<\/li><li><code>-l<\/code>\u6216<code>--ignore-matching-lines<\/code>&nbsp;\u3000\u82e5\u5169\u500b\u6587\u4ef6\u5728\u67d0\u5e7e\u884c\u6709\u6240\u4e0d\u540c\uff0c\u800c\u9019\u5e7e\u884c\u540c\u6642\u90fd\u5305\u542b\u4e86\u9078\u9805\u4e2d\u6307\u5b9a\u7684\u5b57\u7b26\u6216\u5b57\u7b26\u4e32\uff0c\u5247\u4e0d\u986f\u793a\u9019\u5169\u500b\u6587\u4ef6\u7684\u5dee\u7570\u3002<\/li><li><code>-i<\/code>\u6216<code>--ignore-case<\/code>&nbsp;\u3000\u4e0d\u6aa2\u67e5\u5927\u5c0f\u5beb\u7684\u4e0d\u540c\u3002<\/li><li><code>-l<\/code>\u6216<code>--paginate<\/code>&nbsp;\u3000\u5c07\u7d50\u679c\u4ea4\u7531pr\u7a0b\u5e8f\u4f86\u5206\u9801\u3002<\/li><li><code>-n<\/code>\u6216<code>--rcs<\/code>&nbsp;\u3000\u5c07\u6bd4\u8f03\u7d50\u679c\u4ee5RCS\u7684\u683c\u5f0f\u4f86\u986f\u793a\u3002<\/li><li><code>-N<\/code>\u6216<code>--new-file<\/code>&nbsp;\u3000\u5728\u6bd4\u8f03\u76ee\u9304\u6642\uff0c\u82e5\u6587\u4ef6A\u50c5\u51fa\u73fe\u5728\u67d0\u500b\u76ee\u9304\u4e2d\uff0c\u9810\u8a2d\u6703\u986f\u793a\uff1aOnly in\u76ee\u9304\uff1a\u6587\u4ef6A\u82e5\u4f7f\u7528-N\u53c3\u6578\uff0c\u5247diff\u6703\u5c07\u6587\u4ef6A\u8207\u4e00\u500b\u7a7a\u767d\u7684\u6587\u4ef6\u6bd4\u8f03\u3002<\/li><li><code>-p<\/code>&nbsp;\u3000\u82e5\u6bd4\u8f03\u7684\u6587\u4ef6\u7232C\u8a9e\u8a00\u7684\u7a0b\u5e8f\u78bc\u6587\u4ef6\u6642\uff0c\u986f\u793a\u5dee\u7570\u6240\u5728\u7684\u51fd\u6578\u540d\u7a31\u3002<\/li><li><code>-P<\/code>\u6216<code>--unidirectional-new-file<\/code>&nbsp;\u3000\u8207-N\u985e\u4f3c\uff0c\u4f46\u53ea\u6709\u7576\u7b2c\u4e8c\u500b\u76ee\u9304\u5305\u542b\u4e86\u4e00\u500b\u7b2c\u4e00\u500b\u76ee\u9304\u6240\u6c92\u6709\u7684\u6587\u4ef6\u6642\uff0c\u7e94\u6703\u5c07\u9019\u500b\u6587\u4ef6\u8207\u7a7a\u767d\u7684\u6587\u4ef6\u505a\u6bd4\u8f03\u3002<\/li><li><code>-q<\/code>\u6216<code>--brief<\/code>&nbsp;\u3000\u50c5\u986f\u793a\u6709\u7121\u5dee\u7570\uff0c\u4e0d\u986f\u793a\u8a73\u7d30\u7684\u4fe1\u606f\u3002<\/li><li><code>-r<\/code>\u6216<code>--recursive<\/code>&nbsp;\u3000\u6bd4\u8f03\u5b50\u76ee\u9304\u4e2d\u7684\u6587\u4ef6\u3002<\/li><li><code>-s<\/code>\u6216<code>--report-identical-files<\/code>&nbsp;\u3000\u82e5\u6c92\u6709\u767c\u73fe\u4efb\u4f55\u5dee\u7570\uff0c\u4ecd\u7136\u986f\u793a\u4fe1\u606f\u3002<\/li><li><code>-S<\/code>\u6216<code>--starting-file<\/code>&nbsp;\u3000\u5728\u6bd4\u8f03\u76ee\u9304\u6642\uff0c\u5f9e\u6307\u5b9a\u7684\u6587\u4ef6\u958b\u59cb\u6bd4\u8f03\u3002<\/li><li><code>-t<\/code>\u6216<code>--expand-tabs<\/code>&nbsp;\u3000\u5728\u8f38\u51fa\u6642\uff0c\u5c07tab\u5b57\u7b26\u5c55\u958b\u3002<\/li><li><code>-T<\/code>\u6216<code>--initial-tab<\/code>&nbsp;\u3000\u5728\u6bcf\u884c\u524d\u9762\u52a0\u4e0atab\u5b57\u7b26\u4ee5\u4fbf\u5c0d\u9f4a\u3002<\/li><li><code>-u<\/code>,<code>-U<\/code>\u6216<code>--unified=<\/code>&nbsp;\u3000\u4ee5\u5408\u4f75\u7684\u65b9\u5f0f\u4f86\u986f\u793a\u6587\u4ef6\u5167\u5bb9\u7684\u4e0d\u540c\u3002<\/li><li><code>-v<\/code>\u6216<code>--version<\/code>&nbsp;\u3000\u986f\u793a\u7248\u672c\u4fe1\u606f\u3002<\/li><li><code>-w<\/code>\u6216<code>--ignore-all-space<\/code>&nbsp;\u3000\u5ffd\u7565\u5168\u90e8\u7684\u7a7a\u683c\u5b57\u7b26\u3002<\/li><li><code>-W<\/code>\u6216<code>--width<\/code>&nbsp;\u3000\u5728\u4f7f\u7528-y\u53c3\u6578\u6642\uff0c\u6307\u5b9a\u6b04\u5bec\u3002<\/li><li><code>-x<\/code>\u6216<code>--exclude<\/code>&nbsp;\u3000\u4e0d\u6bd4\u8f03\u9078\u9805\u4e2d\u6240\u6307\u5b9a\u7684\u6587\u4ef6\u6216\u76ee\u9304\u3002<\/li><li><code>-X<\/code>\u6216<code>--exclude-from<\/code>&nbsp;\u3000\u60a8\u53ef\u4ee5\u5c07\u6587\u4ef6\u6216\u76ee\u9304\u985e\u578b\u5b58\u6210\u6587\u672c\u6587\u4ef6\uff0c\u7136\u5f8c\u5728=\u4e2d\u6307\u5b9a\u6b64\u6587\u672c\u6587\u4ef6\u3002<\/li><li><code>-y<\/code>\u6216<code>--side-by-side<\/code>&nbsp;\u3000\u4ee5\u4e26\u5217\u7684\u65b9\u5f0f\u986f\u793a\u6587\u4ef6\u7684\u7570\u540c\u4e4b\u8655\u3002<\/li><li><code>--help<\/code>&nbsp;\u3000\u986f\u793a\u5e6b\u52a9\u3002<\/li><li><code>--left-column<\/code>&nbsp;\u3000\u5728\u4f7f\u7528-y\u53c3\u6578\u6642\uff0c\u82e5\u5169\u500b\u6587\u4ef6\u67d0\u4e00\u884c\u5167\u5bb9\u76f8\u540c\uff0c\u5247\u50c5\u5728\u5de6\u5074\u7684\u6b04\u4f4d\u986f\u793a\u8a72\u884c\u5167\u5bb9\u3002<\/li><li><code>--suppress-common-lines<\/code>&nbsp;\u3000\u5728\u4f7f\u7528<code>-y<\/code>\u53c3\u6578\u6642\uff0c\u50c5\u986f\u793a\u4e0d\u540c\u4e4b\u8655\u3002<\/li><\/ul>\n\n\n\n<pre class=\"wp-block-code\"><code># \u6bd4\u8f03\u5169\u500b\u76ee\u9304\u5167\u6a94\u6848\u7684\u5dee\u7570\uff0c\u5217\u51fa\u6240\u6709\u5dee\u7570\u8655\ndiff -bur folder1\/ folder2\/\n\n# \u6bd4\u8f03\u5169\u500b\u76ee\u9304\u5167\u6a94\u6848\u7684\u5dee\u7570\uff0c\u53ea\u5217\u51fa\u6709\u5dee\u7570\u7684\u6a94\u6848\u540d\u7a31\ndiff -qr folder1\/ folder2\/\n\n# \u6392\u5e8f\u6574\u7406\u8f38\u51fa\ndiff -qr folder1\/ folder2\/ | sort\n\n# \u5169\u500b\u6587\u4ef6\u7684\u6bcf\u4e00\u884c\u5c0d\u6bd4\u8f38\u51fa\ndiff file1.txt file2.txt  -y -W 50\n\n# \u6bd4\u8f03\u5169\u500b\u6587\u4ef6\u4e0d\u540c\uff0c\u4e26\u751f\u7522\u88dc\u4e01\ndiff -ruN file1.txt file2.txt > patch.txt\n\n# patch file1.txt patch.txt\npatch file1.txt patch.txt<\/code><\/pre>\n\n\n\n<p>\u53c3\u8003\u8cc7\u6599<\/p>\n\n\n\n<p><a rel=\"noreferrer noopener\" href=\"https:\/\/officeguide.cc\/linux-diff-files-in-two-different-directories-tutorial-examples\/\" target=\"_blank\">https:\/\/officeguide.cc\/linux-diff-files-in-two-different-directories-tutorial-examples\/<\/a><\/p>\n\n\n\n<p><a href=\"https:\/\/www.1ju.org\/linux\/diff\">https:\/\/www.1ju.org\/linux\/diff<\/a><\/p>\n","protected":false},"excerpt":{"rendered":"<p>\u6bd4\u8f032\u500b\u8cc7\u6599\u593e\u6216\u6a94\u6848\u7684\u5dee\u7570 diff [\u53c3\u6578][\u6587\u4ef61\u6216\u76ee\u93041][\u6587\u4ef62\u6216\u76ee\u93042] \u53c3\u6578 &#8211;&nbsp;\u3000\u6307\u5b9a &#8230; <a title=\"diff\" class=\"read-more\" href=\"https:\/\/www.yaj.com.tw\/wordpress\/?p=407\" aria-label=\"\u95b1\u8b80\u3008diff\u3009\u5168\u6587\">\u95b1\u8b80\u5168\u6587<\/a><\/p>\n","protected":false},"author":1,"featured_media":0,"comment_status":"closed","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"footnotes":""},"categories":[3],"tags":[17,9],"class_list":["post-407","post","type-post","status-publish","format-standard","hentry","category-uncategorized","tag-linux","tag-openwrt"],"_links":{"self":[{"href":"https:\/\/www.yaj.com.tw\/wordpress\/index.php?rest_route=\/wp\/v2\/posts\/407","targetHints":{"allow":["GET"]}}],"collection":[{"href":"https:\/\/www.yaj.com.tw\/wordpress\/index.php?rest_route=\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/www.yaj.com.tw\/wordpress\/index.php?rest_route=\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/www.yaj.com.tw\/wordpress\/index.php?rest_route=\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"https:\/\/www.yaj.com.tw\/wordpress\/index.php?rest_route=%2Fwp%2Fv2%2Fcomments&post=407"}],"version-history":[{"count":3,"href":"https:\/\/www.yaj.com.tw\/wordpress\/index.php?rest_route=\/wp\/v2\/posts\/407\/revisions"}],"predecessor-version":[{"id":445,"href":"https:\/\/www.yaj.com.tw\/wordpress\/index.php?rest_route=\/wp\/v2\/posts\/407\/revisions\/445"}],"wp:attachment":[{"href":"https:\/\/www.yaj.com.tw\/wordpress\/index.php?rest_route=%2Fwp%2Fv2%2Fmedia&parent=407"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/www.yaj.com.tw\/wordpress\/index.php?rest_route=%2Fwp%2Fv2%2Fcategories&post=407"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/www.yaj.com.tw\/wordpress\/index.php?rest_route=%2Fwp%2Fv2%2Ftags&post=407"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}