{"id":44674,"date":"2024-10-06T17:20:24","date_gmt":"2024-10-06T09:20:24","guid":{"rendered":"https:\/\/server.hk\/cnblog\/44674\/"},"modified":"2024-10-06T17:20:24","modified_gmt":"2024-10-06T09:20:24","slug":"linux-%e5%91%bd%e4%bb%a4%ef%bc%9adiff-%e9%80%90%e8%a1%8c%e6%af%94%e8%bc%83%e6%96%87%e4%bb%b6","status":"publish","type":"post","link":"https:\/\/server.hk\/cnblog\/44674\/","title":{"rendered":"Linux \u547d\u4ee4\uff1adiff &#8211; \u9010\u884c\u6bd4\u8f03\u6587\u4ef6"},"content":{"rendered":"<h1 id=\"linux-%e5%91%bd%e4%bb%a4%ef%bc%9adiff-%e9%80%90%e8%a1%8c%e6%af%94%e8%bc%83%e6%96%87%e4%bb%b6-ArXvCnNizK\">Linux \u547d\u4ee4\uff1adiff &#8211; \u9010\u884c\u6bd4\u8f03\u6587\u4ef6<\/h1>\n<p>\u5728\u65e5\u5e38\u7684\u958b\u767c\u548c\u7cfb\u7d71\u7ba1\u7406\u5de5\u4f5c\u4e2d\uff0c\u6587\u4ef6\u7684\u6bd4\u8f03\u662f\u4e00\u9805\u5e38\u898b\u7684\u4efb\u52d9\u3002\u7121\u8ad6\u662f\u6e90\u4ee3\u78bc\u7684\u7248\u672c\u63a7\u5236\uff0c\u9084\u662f\u914d\u7f6e\u6587\u4ef6\u7684\u8b8a\u66f4\u6aa2\u67e5\uff0c\u4e86\u89e3\u5982\u4f55\u6709\u6548\u5730\u6bd4\u8f03\u6587\u4ef6\u662f\u975e\u5e38\u91cd\u8981\u7684\u3002\u5728 Linux \u74b0\u5883\u4e2d\uff0c<code>diff<\/code> \u547d\u4ee4\u662f\u4e00\u500b\u5f37\u5927\u7684\u5de5\u5177\uff0c\u80fd\u5920\u9010\u884c\u6bd4\u8f03\u5169\u500b\u6587\u4ef6\uff0c\u4e26\u986f\u793a\u5b83\u5011\u4e4b\u9593\u7684\u5dee\u7570\u3002<\/p>\n<h2 id=\"%e4%bb%80%e9%ba%bc%e6%98%af-diff-%e5%91%bd%e4%bb%a4%ef%bc%9f-ArXvCnNizK\">\u4ec0\u9ebc\u662f diff \u547d\u4ee4\uff1f<\/h2>\n<p><code>diff<\/code> \u547d\u4ee4\u662f Linux \u548c Unix \u7cfb\u7d71\u4e2d\u7528\u65bc\u6bd4\u8f03\u6587\u4ef6\u7684\u5de5\u5177\u3002\u5b83\u6703\u9010\u884c\u6aa2\u67e5\u5169\u500b\u6587\u4ef6\uff0c\u4e26\u986f\u793a\u51fa\u5b83\u5011\u4e4b\u9593\u7684\u4e0d\u540c\u4e4b\u8655\u3002\u9019\u5c0d\u65bc\u958b\u767c\u8005\u4f86\u8aaa\uff0c\u5c24\u5176\u662f\u5728\u9032\u884c\u7248\u672c\u63a7\u5236\u6642\uff0c\u80fd\u5920\u5feb\u901f\u8b58\u5225\u51fa\u4ee3\u78bc\u7684\u8b8a\u66f4\u662f\u975e\u5e38\u6709\u7528\u7684\u3002<\/p>\n<h2 id=\"%e5%9f%ba%e6%9c%ac%e7%94%a8%e6%b3%95-ArXvCnNizK\">\u57fa\u672c\u7528\u6cd5<\/h2>\n<p>\u4f7f\u7528 <code>diff<\/code> \u547d\u4ee4\u7684\u57fa\u672c\u8a9e\u6cd5\u5982\u4e0b\uff1a<\/p>\n<pre><code>diff [\u9078\u9805] \u6587\u4ef61 \u6587\u4ef62<\/code><\/pre>\n<p>\u4f8b\u5982\uff0c\u5047\u8a2d\u6211\u5011\u6709\u5169\u500b\u6587\u672c\u6587\u4ef6 <code>file1.txt<\/code> \u548c <code>file2.txt<\/code>\uff0c\u53ef\u4ee5\u4f7f\u7528\u4ee5\u4e0b\u547d\u4ee4\u4f86\u6bd4\u8f03\u5b83\u5011\uff1a<\/p>\n<pre><code>diff file1.txt file2.txt<\/code><\/pre>\n<h2 id=\"%e8%bc%b8%e5%87%ba%e8%a7%a3%e8%ae%80-ArXvCnNizK\">\u8f38\u51fa\u89e3\u8b80<\/h2>\n<p>\u7576\u57f7\u884c\u4e0a\u8ff0\u547d\u4ee4\u5f8c\uff0c<code>diff<\/code> \u6703\u8f38\u51fa\u5169\u500b\u6587\u4ef6\u4e4b\u9593\u7684\u5dee\u7570\u3002\u8f38\u51fa\u7684\u683c\u5f0f\u901a\u5e38\u5982\u4e0b\uff1a<\/p>\n<pre><code>1c1\n file2.txt \u7684\u5167\u5bb9\n<\/code><\/pre>\n<p>\u9019\u88e1\u7684 <code>1c1<\/code> \u8868\u793a\u5728\u7b2c\u4e00\u884c\u6709\u8b8a\u66f4\u3002\u7b26\u865f <code>&lt;<\/code> \u8868\u793a\u4f86\u81ea <code>file1.txt<\/code> \u7684\u5167\u5bb9\uff0c\u800c <code>&gt;<\/code> \u5247\u8868\u793a\u4f86\u81ea <code>file2.txt<\/code> \u7684\u5167\u5bb9\u3002<\/p>\n<h2 id=\"%e5%b8%b8%e7%94%a8%e9%81%b8%e9%a0%85-ArXvCnNizK\">\u5e38\u7528\u9078\u9805<\/h2>\n<p><code>diff<\/code> \u547d\u4ee4\u6709\u591a\u500b\u9078\u9805\uff0c\u53ef\u4ee5\u6839\u64da\u9700\u8981\u9032\u884c\u8abf\u6574\uff1a<\/p>\n<ul>\n<li><code>-u<\/code>\uff1a\u4ee5\u7d71\u4e00\u683c\u5f0f\u986f\u793a\u5dee\u7570\uff0c\u9019\u5c0d\u65bc\u67e5\u770b\u4e0a\u4e0b\u6587\u975e\u5e38\u6709\u7528\u3002<\/li>\n<li><code>-i<\/code>\uff1a\u5ffd\u7565\u5927\u5c0f\u5beb\u7684\u5dee\u7570\u3002<\/li>\n<li><code>-w<\/code>\uff1a\u5ffd\u7565\u7a7a\u683c\u7684\u5dee\u7570\u3002<\/li>\n<li><code>-r<\/code>\uff1a\u905e\u6b78\u6bd4\u8f03\u76ee\u9304\u4e2d\u7684\u6240\u6709\u6587\u4ef6\u3002<\/li>\n<\/ul>\n<p>\u4f8b\u5982\uff0c\u4f7f\u7528\u7d71\u4e00\u683c\u5f0f\u6bd4\u8f03\u5169\u500b\u6587\u4ef6\u7684\u547d\u4ee4\u5982\u4e0b\uff1a<\/p>\n<pre><code>diff -u file1.txt file2.txt<\/code><\/pre>\n<h2 id=\"%e5%af%a6%e9%9a%9b%e6%87%89%e7%94%a8%e6%a1%88%e4%be%8b-ArXvCnNizK\">\u5be6\u969b\u61c9\u7528\u6848\u4f8b<\/h2>\n<p>\u5047\u8a2d\u4f60\u5728\u958b\u767c\u4e00\u500b\u61c9\u7528\u7a0b\u5e8f\uff0c\u4e26\u4e14\u6709\u4e00\u500b\u914d\u7f6e\u6587\u4ef6 <code>config_v1.txt<\/code> \u548c\u66f4\u65b0\u5f8c\u7684\u7248\u672c <code>config_v2.txt<\/code>\u3002\u4f60\u53ef\u4ee5\u4f7f\u7528 <code>diff<\/code> \u547d\u4ee4\u4f86\u6aa2\u67e5\u9019\u5169\u500b\u6587\u4ef6\u4e4b\u9593\u7684\u8b8a\u66f4\uff1a<\/p>\n<pre><code>diff -u config_v1.txt config_v2.txt<\/code><\/pre>\n<p>\u9019\u6a23\u53ef\u4ee5\u6e05\u695a\u5730\u770b\u5230\u54ea\u4e9b\u914d\u7f6e\u9805\u88ab\u6dfb\u52a0\u3001\u522a\u9664\u6216\u4fee\u6539\uff0c\u5f9e\u800c\u5e6b\u52a9\u4f60\u5feb\u901f\u7406\u89e3\u8b8a\u66f4\u7684\u5f71\u97ff\u3002<\/p>\n<h2 id=\"%e7%b5%90%e8%ab%96-ArXvCnNizK\">\u7d50\u8ad6<\/h2>\n<p>\u5728 Linux \u74b0\u5883\u4e2d\uff0c<code>diff<\/code> \u547d\u4ee4\u662f\u4e00\u500b\u4e0d\u53ef\u6216\u7f3a\u7684\u5de5\u5177\uff0c\u80fd\u5920\u5e6b\u52a9\u7528\u6236\u6709\u6548\u5730\u6bd4\u8f03\u6587\u4ef6\uff0c\u8b58\u5225\u8b8a\u66f4\u3002\u7121\u8ad6\u662f\u5728\u958b\u767c\u904e\u7a0b\u4e2d\u9084\u662f\u7cfb\u7d71\u7ba1\u7406\u4e2d\uff0c\u638c\u63e1\u9019\u500b\u547d\u4ee4\u90fd\u80fd\u63d0\u9ad8\u5de5\u4f5c\u6548\u7387\u3002<\/p>\n<p>\u5982\u679c\u4f60\u5c0d\u65bc <a href=\"https:\/\/server.hk\">VPS<\/a> \u670d\u52d9\u6709\u8208\u8da3\uff0cServer.HK \u63d0\u4f9b\u591a\u7a2e\u9078\u64c7\uff0c\u9069\u5408\u4e0d\u540c\u9700\u6c42\u7684\u7528\u6236\u3002\u7121\u8ad6\u662f\u9700\u8981\u9ad8\u6027\u80fd\u7684 <a href=\"https:\/\/server.hk\">\u9999\u6e2f\u4f3a\u670d\u5668<\/a> \u9084\u662f\u9748\u6d3b\u7684 <a href=\"https:\/\/server.hk\">\u96f2\u4f3a\u670d\u5668<\/a>\uff0c\u6211\u5011\u90fd\u80fd\u6eff\u8db3\u4f60\u7684\u9700\u6c42\u3002<\/p>\n","protected":false},"excerpt":{"rendered":"<p>\u4f7f\u7528 Linux \u547d\u4ee4 diff \u9010\u884c\u6bd4\u8f03\u6587\u4ef6\uff0c\u8f15\u9b06\u8b58\u5225\u5dee\u7570\uff0c\u5e6b\u52a9\u958b\u767c\u8005\u548c\u7528\u6236\u9ad8\u6548\u7ba1\u7406\u548c\u540c\u6b65\u6587\u672c\u5167\u5bb9\u3002<\/p>\n","protected":false},"author":1,"featured_media":0,"comment_status":"closed","ping_status":"","sticky":false,"template":"","format":"standard","meta":{"footnotes":""},"categories":[4924],"tags":[],"class_list":["post-44674","post","type-post","status-publish","format-standard","hentry","category-setup-tutorials"],"_links":{"self":[{"href":"https:\/\/server.hk\/cnblog\/wp-json\/wp\/v2\/posts\/44674","targetHints":{"allow":["GET"]}}],"collection":[{"href":"https:\/\/server.hk\/cnblog\/wp-json\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/server.hk\/cnblog\/wp-json\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/server.hk\/cnblog\/wp-json\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"https:\/\/server.hk\/cnblog\/wp-json\/wp\/v2\/comments?post=44674"}],"version-history":[{"count":1,"href":"https:\/\/server.hk\/cnblog\/wp-json\/wp\/v2\/posts\/44674\/revisions"}],"predecessor-version":[{"id":44675,"href":"https:\/\/server.hk\/cnblog\/wp-json\/wp\/v2\/posts\/44674\/revisions\/44675"}],"wp:attachment":[{"href":"https:\/\/server.hk\/cnblog\/wp-json\/wp\/v2\/media?parent=44674"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/server.hk\/cnblog\/wp-json\/wp\/v2\/categories?post=44674"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/server.hk\/cnblog\/wp-json\/wp\/v2\/tags?post=44674"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}