{"id":2974,"date":"2023-05-14T00:13:59","date_gmt":"2023-05-13T16:13:59","guid":{"rendered":"https:\/\/hsin-life.com\/?p=2974"},"modified":"2023-05-14T00:14:01","modified_gmt":"2023-05-13T16:14:01","slug":"linux-diff-%e5%91%bd%e4%bb%a4%ef%bc%9a%e6%96%87%e4%bb%b6%e6%af%94%e5%b0%8d%e7%9a%84%e5%bc%b7%e5%a4%a7%e5%b7%a5%e5%85%b7","status":"publish","type":"post","link":"https:\/\/hsin-life.com\/archives\/2974","title":{"rendered":"Linux diff \u547d\u4ee4\uff1a\u6587\u4ef6\u6bd4\u5c0d\u7684\u5f37\u5927\u5de5\u5177"},"content":{"rendered":"\n<p>\u5728 Linux \u7cfb\u7d71\u4e2d\uff0c<code>diff<\/code> \u662f\u4e00\u500b\u975e\u5e38\u5be6\u7528\u7684\u547d\u4ee4\uff0c\u7528\u65bc\u6bd4\u8f03\u6587\u4ef6\u7684\u5dee\u7570\u3002<code>diff<\/code> \u4ee5\u9010\u884c\u7684\u65b9\u5f0f\uff0c\u6bd4\u8f03\u6587\u672c\u6587\u4ef6\u7684\u7570\u540c\u8655\u3002\u5982\u679c\u6307\u5b9a\u8981\u6bd4\u8f03\u7684\u662f\u76ee\u9304\uff0c<code>diff<\/code> \u6703\u6bd4\u8f03\u76ee\u9304\u4e2d\u76f8\u540c\u6587\u4ef6\u540d\u7684\u6587\u4ef6\uff0c\u4f46\u4e0d\u6703\u6bd4\u8f03\u5176\u4e2d\u7684\u5b50\u76ee\u9304\u3002<\/p>\n\n\n\n<p>\u57fa\u672c\u7684 <code>diff<\/code> \u547d\u4ee4\u8a9e\u6cd5\u70ba\uff1a<code>diff [\u9078\u9805] \u6587\u4ef6\u6216\u76ee\u93041 \u6587\u4ef6\u6216\u76ee\u93042<\/code>\u3002\u5176\u4e2d\uff0c\u9078\u9805\u90e8\u5206\u5305\u542b\u4e86\u8a31\u591a\u53ef\u7528\u7684\u53c3\u6578\uff0c\u8b93\u4f60\u80fd\u6839\u64da\u9700\u8981\u5ba2\u88fd\u5316\u6bd4\u8f03\u65b9\u5f0f\u3002<\/p>\n\n\n\n<p>\u4f8b\u5982\uff0c<code>-a<\/code> \u6216 <code>--text<\/code> \u9078\u9805\u8b93 <code>diff<\/code> \u9810\u8a2d\u53ea\u6703\u9010\u884c\u6bd4\u8f03\u6587\u672c\u6587\u4ef6\uff0c<code>-b<\/code> \u6216 <code>--ignore-space-change<\/code> \u53c3\u6578\u53ef\u4ee5\u8b93 <code>diff<\/code> \u4e0d\u6aa2\u67e5\u7a7a\u683c\u5b57\u7b26\u7684\u4e0d\u540c\u3002\u53e6\u5916\uff0c<code>-B<\/code> \u6216 <code>--ignore-blank-lines<\/code> \u53c3\u6578\u53ef\u4ee5\u4f7f <code>diff<\/code> \u4e0d\u6aa2\u67e5\u7a7a\u767d\u884c\u3002<\/p>\n\n\n\n<p><code>diff<\/code> \u547d\u4ee4\u4e5f\u63d0\u4f9b\u4e86\u591a\u7a2e\u8f38\u51fa\u683c\u5f0f\uff0c\u5982 <code>-c<\/code> \u9078\u9805\u6703\u986f\u793a\u5168\u90e8\u5167\u6587\u4e26\u6a19\u51fa\u4e0d\u540c\u4e4b\u8655\uff0c<code>-u<\/code> \u6216 <code>-U&lt;\u5217\u6578&gt;<\/code> \u6216 <code>--unified=&lt;\u5217\u6578&gt;<\/code> \u53c3\u6578\u5247\u53ef\u4ee5\u4ee5\u5408\u4f75\u7684\u65b9\u5f0f\u4f86\u986f\u793a\u6587\u4ef6\u5167\u5bb9\u7684\u4e0d\u540c\u3002<\/p>\n\n\n\n<p>\u9664\u4e86\u57fa\u672c\u7684\u6bd4\u5c0d\u529f\u80fd\uff0c<code>diff<\/code> \u9084\u6709\u4e00\u4e9b\u9032\u968e\u9078\u9805\uff0c\u5982 <code>-r<\/code> \u6216 <code>--recursive<\/code> \u53c3\u6578\u53ef\u4ee5\u6bd4\u8f03\u5b50\u76ee\u9304\u4e2d\u7684\u6587\u4ef6\uff0c<code>-N<\/code> \u6216 <code>--new-file<\/code> \u53c3\u6578\u5728\u6bd4\u8f03\u76ee\u9304\u6642\uff0c\u5982\u679c\u6587\u4ef6A\u53ea\u5728\u67d0\u500b\u76ee\u9304\u4e2d\u5b58\u5728\uff0c<code>diff<\/code> \u6703\u5c07\u6587\u4ef6A\u8207\u4e00\u500b\u7a7a\u767d\u7684\u6587\u4ef6\u9032\u884c\u6bd4\u8f03\u3002<\/p>\n\n\n\n<p>\u5728\u5be6\u969b\u61c9\u7528\u4e2d\uff0c\u6211\u5011\u53ef\u4ee5\u4f7f\u7528 <code>diff<\/code> \u4f86\u627e\u51fa\u5169\u500b\u6587\u4ef6\u7684\u4e0d\u540c\u4e4b\u8655\u3002\u4f8b\u5982\uff0c\u6bd4\u8f03\u5169\u500b\u65e5\u8a8c\u6587\u4ef6 log2014.log \u548c log2013.log\uff0c\u6211\u5011\u53ef\u4ee5\u4f7f\u7528<code>diff log2014.log log2013.log<\/code> \u547d\u4ee4\u3002\u9019\u6a23\uff0cdiff \u6703\u4ee5\u9010\u884c\u7684\u65b9\u5f0f\u6bd4\u8f03\u9019\u5169\u500b\u6587\u4ef6\uff0c\u4e26\u5217\u51fa\u6240\u6709\u7684\u4e0d\u540c\u4e4b\u8655\u3002<\/p>\n\n\n\n<p><code>diff<\/code> \u4e5f\u652f\u63f4\u4e26\u6392\u683c\u5f0f\u8f38\u51fa\uff0c\u6211\u5011\u53ef\u4ee5\u4f7f\u7528 <code>-y<\/code> \u548c <code>-W<\/code> \u9078\u9805\u4f86\u5be6\u73fe\u3002\u6bd4\u5982\uff0c<code>diff log2014.log log2013.log -y -W 50<\/code>\uff0c\u9019\u6a23\u5c31\u6703\u4ee5\u4e26\u6392\u7684\u65b9\u5f0f\u986f\u793a\u9019\u5169\u500b\u6587\u4ef6\u7684\u4e0d\u540c\u4e4b\u8655\uff0c\u4e26\u5c07\u6bcf\u5217\u7684\u5bec\u5ea6\u8a2d\u70ba 50 \u500b\u5b57\u7b26\u3002<\/p>\n\n\n\n<p>\u5728\u4e26\u6392\u683c\u5f0f\u8f38\u51fa\u4e2d\uff0c&#8221;|&#8221; \u8868\u793a\u524d\u5f8c\u5169\u500b\u6587\u4ef6\u5167\u5bb9\u6709\u4e0d\u540c\uff0c&#8221;&lt;&#8221; \u8868\u793a\u5f8c\u9762\u7684\u6587\u4ef6\u6bd4\u524d\u9762\u7684\u6587\u4ef6\u5c11\u4e86\u4e00\u884c\u5167\u5bb9\uff0c&#8221;&gt;&#8221; \u8868\u793a\u5f8c\u9762\u7684\u6587\u4ef6\u6bd4\u524d\u9762\u7684\u6587\u4ef6\u591a\u4e86\u4e00\u884c\u5167\u5bb9\u3002<\/p>\n\n\n\n<p>\u7e3d\u7684\u4f86\u8aaa\uff0cLinux \u7684 <code>diff<\/code> \u547d\u4ee4\u662f\u4e00\u500b\u5f37\u5927\u7684\u5de5\u5177\uff0c\u53ef\u4ee5\u5e6b\u52a9\u6211\u5011\u5728\u958b\u767c\u548c\u9664\u932f\u904e\u7a0b\u4e2d\uff0c\u5feb\u901f\u627e\u51fa\u6587\u4ef6\u548c\u7a0b\u5f0f\u78bc\u7684\u5dee\u7570\u3002\u638c\u63e1\u5b83\u7684\u4f7f\u7528\uff0c\u5c07\u5927\u5927\u63d0\u5347\u6211\u5011\u7684\u6548\u7387\u3002<\/p>\n","protected":false},"excerpt":{"rendered":"<p>\u672c\u6587\u70ba\u4f60\u8a73\u7d30\u4ecb\u7d39 Linux \u7684 diff \u547d\u4ee4\uff0c\u9019\u662f\u4e00\u500b\u5f37\u5927\u7684\u6587\u4ef6\u6bd4\u5c0d\u5de5\u5177\uff0c\u53ef\u4ee5\u9010\u884c\u6bd4\u8f03\u6587\u672c\u6587\u4ef6\u7684\u5dee\u7570\u3002\u900f\u904e diff \u547d\u4ee4\uff0c\u6211\u5011\u53ef\u4ee5\u5728\u958b\u767c\u548c\u9664\u932f\u904e\u7a0b\u4e2d\uff0c\u8f15\u9b06\u627e\u51fa\u6587\u4ef6\u548c\u7a0b\u5f0f\u78bc\u7684\u5dee\u7570\u3002<\/p>\n","protected":false},"author":1,"featured_media":2975,"comment_status":"open","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"_kad_post_transparent":"","_kad_post_title":"","_kad_post_layout":"","_kad_post_sidebar_id":"","_kad_post_content_style":"","_kad_post_vertical_padding":"","_kad_post_feature":"","_kad_post_feature_position":"","_kad_post_header":false,"_kad_post_footer":false,"_jetpack_memberships_contains_paid_content":false,"footnotes":""},"categories":[752],"tags":[958,694,960,959,961],"aioseo_notices":[],"jetpack_sharing_enabled":true,"jetpack_featured_media_url":"https:\/\/i0.wp.com\/hsin-life.com\/wp-content\/uploads\/2023\/05\/pexels-photo-2528118-1.jpeg?fit=869%2C1300&ssl=1","jetpack-related-posts":[],"_links":{"self":[{"href":"https:\/\/hsin-life.com\/wp-json\/wp\/v2\/posts\/2974"}],"collection":[{"href":"https:\/\/hsin-life.com\/wp-json\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/hsin-life.com\/wp-json\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/hsin-life.com\/wp-json\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"https:\/\/hsin-life.com\/wp-json\/wp\/v2\/comments?post=2974"}],"version-history":[{"count":2,"href":"https:\/\/hsin-life.com\/wp-json\/wp\/v2\/posts\/2974\/revisions"}],"predecessor-version":[{"id":2977,"href":"https:\/\/hsin-life.com\/wp-json\/wp\/v2\/posts\/2974\/revisions\/2977"}],"wp:featuredmedia":[{"embeddable":true,"href":"https:\/\/hsin-life.com\/wp-json\/wp\/v2\/media\/2975"}],"wp:attachment":[{"href":"https:\/\/hsin-life.com\/wp-json\/wp\/v2\/media?parent=2974"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/hsin-life.com\/wp-json\/wp\/v2\/categories?post=2974"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/hsin-life.com\/wp-json\/wp\/v2\/tags?post=2974"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}