{"id":68638,"date":"2025-05-12T15:12:30","date_gmt":"2025-05-12T07:12:30","guid":{"rendered":"https:\/\/fwq.ai\/blog\/?p=68638"},"modified":"2025-05-12T15:12:30","modified_gmt":"2025-05-12T07:12:30","slug":"linux-%e4%b8%ad-diff-%e5%91%bd%e4%bb%a4%e8%af%a6%e8%a7%a3%ef%bc%9a%e7%b2%be%e5%87%86%e8%af%86%e5%88%ab%e6%96%87%e4%bb%b6%e5%b7%ae%e5%bc%82%e7%9a%84%e5%88%a9%e5%99%a8","status":"publish","type":"post","link":"https:\/\/fwq.ai\/blog\/68638\/","title":{"rendered":"Linux \u4e2d diff \u547d\u4ee4\u8be6\u89e3\uff1a\u7cbe\u51c6\u8bc6\u522b\u6587\u4ef6\u5dee\u5f02\u7684\u5229\u5668"},"content":{"rendered":"<h2>\u524d\u8a00<\/h2>\n<p>\u5728\u65e5\u5e38\u7684\u5f00\u53d1\u8fd0\u7ef4\u8fc7\u7a0b\u4e2d\uff0c\u6211\u4eec\u7ecf\u5e38\u9700\u8981\u5224\u65ad\u4e24\u4e2a\u6587\u4ef6\u6216\u76ee\u5f55\u7684\u5dee\u5f02\u3002\u8fd9\u65f6\uff0cLinux \u7cfb\u7edf\u81ea\u5e26\u7684 diff \u547d\u4ee4\u5c31\u663e\u5f97\u683c\u5916\u5f3a\u5927\u548c\u5b9e\u7528\u3002\u672c\u6587\u5c06\u8be6\u7ec6\u4ecb\u7ecd diff \u7684\u7528\u6cd5\u3001\u8f93\u51fa\u683c\u5f0f\u4ee5\u53ca\u5b9e\u6218\u6280\u5de7\uff0c\u5e2e\u52a9\u60a8\u66f4\u9ad8\u6548\u5730\u5904\u7406\u914d\u7f6e\u53d8\u66f4\u548c\u7248\u672c\u5bf9\u6bd4\u7b49\u4efb\u52a1\u3002<\/p>\n<h2>\u4e00\u3001diff \u547d\u4ee4\u6982\u8ff0<\/h2>\n<p>diff \u662f Linux\/Unix \u73af\u5883\u4e2d\u7528\u4e8e\u6bd4\u8f83\u4e24\u4e2a\u6587\u4ef6\u6216\u76ee\u5f55\u5185\u5bb9\u5dee\u5f02\u7684\u5de5\u5177\u3002\u5b83\u80fd\u7cbe\u51c6\u5730\u6307\u51fa\u54ea\u4e9b\u884c\u53d1\u751f\u4e86\u66f4\u6539\uff08\u65b0\u589e\u3001\u5220\u9664\u6216\u4fee\u6539\uff09\uff0c\u5e76\u4ee5\u591a\u79cd\u683c\u5f0f\u5448\u73b0\uff0c\u9002\u7528\u4e8e\u4ee3\u7801\u5ba1\u67e5\u3001\u914d\u7f6e\u6bd4\u5bf9\u7b49\u573a\u666f\u3002<\/p>\n<p>\u5728\u4f7f\u7528\u8fdc\u7a0b\u670d\u52a1\u5668\u8fdb\u884c\u81ea\u52a8\u5316\u90e8\u7f72\u3001\u7248\u672c\u63a7\u5236\u65f6\uff0c\u914d\u5408\u9ad8\u6027\u80fd\u7684\u7f8e\u56fd\u4e91\u670d\u52a1\u5668\u53ef\u4ee5\u663e\u8457\u63d0\u5347\u5904\u7406\u6548\u7387\u4e0e\u6570\u636e\u4e00\u81f4\u6027\u3002<\/p>\n<h2>\u4e8c\u3001\u57fa\u7840\u8bed\u6cd5\u7ed3\u6784<\/h2>\n<pre><code class=\"language-bash\">diff [\u9009\u9879] \u6587\u4ef61 \u6587\u4ef62\r\n<\/code><\/pre>\n<ul>\n<li>\u6587\u4ef61 \u901a\u5e38\u8868\u793a\u65e7\u7248\u672c\u5185\u5bb9<\/li>\n<li>\u6587\u4ef62 \u662f\u5f53\u524d\u6216\u4fee\u6539\u540e\u7684\u7248\u672c<\/li>\n<\/ul>\n<h3>\u793a\u4f8b\uff1a\u5355\u6587\u4ef6\u5dee\u5f02\u6bd4\u8f83<\/h3>\n<p>\u521b\u5efa\u4e24\u4e2a\u6837\u4f8b\u6587\u672c\u6587\u4ef6\uff1a<\/p>\n<pre><code class=\"language-bash\">echo -e \"apple\\nbanana\\ncherry\\ndate\" &gt; fruits1.txt\r\necho -e \"apple\\nblueberry\\ncherry\\nfig\" &gt; fruits2.txt\r\n<\/code><\/pre>\n<p>\u6267\u884c\u5bf9\u6bd4\u547d\u4ee4\uff1a<\/p>\n<pre><code class=\"language-bash\">diff fruits1.txt fruits2.txt\r\n<\/code><\/pre>\n<p>\u8f93\u51fa\u7ed3\u679c\u5982\u4e0b\uff1a<\/p>\n<pre><code>2c2\r\n&lt; banana\r\n---\r\n&gt; blueberry\r\n4c4\r\n&lt; date\r\n---\r\n&gt; fig\r\n<\/code><\/pre>\n<p>\u8fd9\u91cc\uff0c\u201c2c2\u201d \u8868\u793a\u7b2c2\u884c\u5185\u5bb9\u53d1\u751f\u4e86\u66f4\u6539\uff0c\u201c&lt;\u201d\u548c\u201c&gt;\u201d\u5206\u522b\u6807\u793a\u4e24\u4e2a\u6587\u4ef6\u4e2d\u7684\u4e0d\u540c\u5185\u5bb9\u3002<\/p>\n<h2>\u4e09\u3001\u76ee\u5f55\u7ea7\u522b\u6bd4\u8f83\u6280\u5de7<\/h2>\n<p>\u9664\u4e86\u5355\u4e2a\u6587\u4ef6\uff0cdiff \u4e5f\u80fd\u6bd4\u8f83\u4e24\u4e2a\u76ee\u5f55\u7684\u5dee\u5f02\uff1a<\/p>\n<pre><code class=\"language-bash\">diff -r dir1\/ dir2\/\r\n<\/code><\/pre>\n<p>\u5e38\u89c1\u7ec4\u5408\u53c2\u6570\u5982\u4e0b\uff1a<\/p>\n<pre><code class=\"language-bash\">diff -rq dirA\/ dirB\/  # \u4ec5\u8f93\u51fa\u4e0d\u540c\u7684\u6587\u4ef6\u540d\r\ndiff -rw dirX\/ dirY\/  # \u5ffd\u7565\u7a7a\u683c\u5dee\u5f02\r\n<\/code><\/pre>\n<p>\u8fd9\u5bf9\u914d\u7f6e\u6587\u4ef6\u7ba1\u7406\u6216\u4ee3\u7801\u540c\u6b65\u9a8c\u8bc1\u975e\u5e38\u6709\u7528\u3002<\/p>\n<h2>\u56db\u3001\u8f93\u51fa\u683c\u5f0f\u7c7b\u578b<\/h2>\n<p>diff \u652f\u6301\u591a\u79cd\u8f93\u51fa\u683c\u5f0f\uff0c\u9002\u5e94\u4e0d\u540c\u7528\u6237\u9700\u6c42\uff1a<\/p>\n<h3>1. \u9ed8\u8ba4\u683c\u5f0f\uff08Normal\uff09<\/h3>\n<p>\u9ed8\u8ba4\u683c\u5f0f\u9002\u7528\u4e8e\u7b80\u6d01\u8f93\u51fa\uff0c\u4f46\u5bf9\u4e8e\u5927\u89c4\u6a21\u53d8\u66f4\u53ef\u80fd\u4e0d\u591f\u76f4\u89c2\u3002<\/p>\n<h3>2. \u7edf\u4e00\u683c\u5f0f\uff08Unified\uff09<\/h3>\n<p>\u4f7f\u7528 <code>-u<\/code> \u5f00\u542f\u7edf\u4e00\u683c\u5f0f\uff0c\u5c55\u793a\u53d8\u52a8\u4e0a\u4e0b\u6587\uff08\u9ed8\u8ba4\u4e3a3\u884c\uff09\uff1a<\/p>\n<pre><code class=\"language-bash\">diff -u fruits1.txt fruits2.txt\r\n<\/code><\/pre>\n<p>\u8fd9\u4e5f\u662f\u5f00\u6e90\u9879\u76ee\u4e2d\u6700\u5e38\u89c1\u7684\u8865\u4e01\u683c\u5f0f\uff0c\u6709\u5229\u4e8e\u7248\u672c\u63a7\u5236\u7cfb\u7edf\u96c6\u6210\u3002<\/p>\n<h3>3. \u4e0a\u4e0b\u6587\u683c\u5f0f\uff08Context\uff09<\/h3>\n<p>\u901a\u8fc7 <code>-c<\/code> \u53c2\u6570\u542f\u7528\uff0c\u4fdd\u7559\u66f4\u591a\u4e0a\u4e0b\u6587\uff0c\u9002\u5408\u9605\u8bfb\u8f83\u5927\u7684\u4fee\u6539\u7247\u6bb5\uff1a<\/p>\n<pre><code class=\"language-bash\">diff -c fruits1.txt fruits2.txt\r\n<\/code><\/pre>\n<h3>4. \u5e76\u6392\u683c\u5f0f\uff08Side-by-Side\uff09<\/h3>\n<p>\u5e76\u5217\u8f93\u51fa\u5de6\u53f3\u4e24\u6587\u4ef6\u5185\u5bb9\uff0c\u4fbf\u4e8e\u4eba\u5de5\u5bf9\u6bd4\uff1a<\/p>\n<pre><code class=\"language-bash\">diff -y fruits1.txt fruits2.txt\r\n<\/code><\/pre>\n<p>\u6b64\u683c\u5f0f\u5c24\u5176\u9002\u5408\u5728\u56fe\u5f62\u7ec8\u7aef\u6216\u5bbd\u5c4f\u663e\u793a\u4e2d\u4f7f\u7528\uff0c\u63d0\u5347\u4eba\u5de5\u5bf9\u6bd4\u6548\u7387\u3002<\/p>\n<h2>\u4e94\u3001\u5e38\u89c1\u5b9e\u7528\u53c2\u6570<\/h2>\n<table>\n<thead>\n<tr>\n<th>\u53c2\u6570<\/th>\n<th>\u542b\u4e49<\/th>\n<\/tr>\n<\/thead>\n<tbody>\n<tr>\n<td><code>-u<\/code> \u6216 <code>--unified<\/code><\/td>\n<td>\u663e\u793a\u7edf\u4e00\u683c\u5f0f\u8f93\u51fa<\/td>\n<\/tr>\n<tr>\n<td><code>-c<\/code> \u6216 <code>--context<\/code><\/td>\n<td>\u542f\u7528\u4e0a\u4e0b\u6587\u683c\u5f0f<\/td>\n<\/tr>\n<tr>\n<td><code>-y<\/code> \u6216 <code>--side-by-side<\/code><\/td>\n<td>\u5e76\u6392\u663e\u793a\u5bf9\u6bd4\u7ed3\u679c<\/td>\n<\/tr>\n<tr>\n<td><code>-w<\/code><\/td>\n<td>\u5ffd\u7565\u6240\u6709\u7a7a\u683c\u5dee\u5f02<\/td>\n<\/tr>\n<tr>\n<td><code>-b<\/code><\/td>\n<td>\u5ffd\u7565\u7a7a\u683c\u6570\u91cf\u53d8\u5316<\/td>\n<\/tr>\n<tr>\n<td><code>-B<\/code><\/td>\n<td>\u5ffd\u7565\u7a7a\u884c\u5dee\u5f02<\/td>\n<\/tr>\n<tr>\n<td><code>-I<\/code> PATTERN<\/td>\n<td>\u5ffd\u7565\u5339\u914d\u67d0\u6b63\u5219\u8868\u8fbe\u5f0f\u7684\u884c\u5dee\u5f02<\/td>\n<\/tr>\n<\/tbody>\n<\/table>\n<p>\u8fd9\u4e9b\u53c2\u6570\u7ec4\u5408\u53ef\u6839\u636e\u5b9e\u9645\u5e94\u7528\u7075\u6d3b\u8c03\u6574\uff0c\u9002\u914d\u4e0d\u540c\u7684\u4e1a\u52a1\u9700\u6c42\u3002<\/p>\n<h2>\u516d\u3001\u4f7f\u7528\u573a\u666f\u4e0e\u4f18\u5316\u5efa\u8bae<\/h2>\n<p>\u5728 DevOps \u6d41\u7a0b\u4e2d\uff0cdiff \u5e38\u7528\u4e8e\uff1a<\/p>\n<ul>\n<li>\u81ea\u52a8\u5316\u811a\u672c\u524d\u540e\u914d\u7f6e\u9a8c\u8bc1<\/li>\n<li>\u5b89\u5168\u5ba1\u8ba1\u4e2d\u6bd4\u5bf9\u914d\u7f6e\u6587\u4ef6\u53d8\u66f4<\/li>\n<li>\u8865\u4e01\u751f\u6210\u4e0e\u5e94\u7528<\/li>\n<li>\u6587\u4ef6\u540c\u6b65\u6821\u9a8c<\/li>\n<\/ul>\n<p>\u5efa\u8bae\u642d\u914d\u9ad8\u5e26\u5bbd\u3001\u4f4e\u5ef6\u8fdf\u7684\u7f8e\u56fdVPS\u4f7f\u7528\uff0c\u5982\u9700\u8fdc\u7a0b\u6bd4\u5bf9\u6216\u7248\u672c\u56de\u6eda\u5904\u7406\uff0c\u7f8e\u56fd\u670d\u52a1\u5668\u63d0\u4f9b\u4f18\u5f02\u7684\u5e26\u5bbd\u8d44\u6e90\u4e0e\u7a33\u5b9a\u7684\u7f51\u7edc\u73af\u5883\uff0c\u53ef\u63d0\u5347\u6574\u4f53\u8fd0\u7ef4\u6548\u7387\u3002<\/p>\n<h2>\u4e03\u3001\u7ed3\u8bed<\/h2>\n<p>diff \u662f\u4e00\u4e2a\u867d\u5c0f\u4f46\u6781\u5177\u5b9e\u7528\u4ef7\u503c\u7684\u5de5\u5177\uff0c\u638c\u63e1\u5b83\u7684\u7528\u6cd5\u53ef\u4ee5\u5728\u65e5\u5e38\u5f00\u53d1\u4e0e\u7cfb\u7edf\u7ef4\u62a4\u4e2d\u8282\u7701\u5927\u91cf\u65f6\u95f4\u548c\u7cbe\u529b\u3002\u7279\u522b\u662f\u5728\u4e91\u7aef\u90e8\u7f72\u3001\u8de8\u5883\u4e1a\u52a1\u540c\u6b65\u7b49\u573a\u666f\u4e0b\uff0c\u63a8\u8350\u914d\u5408\u9ad8\u6027\u80fd\u7684<a href=\"https:\/\/fwq.ai\/\">\u7f8e\u56fd\u670d\u52a1\u5668<\/a>\u4f7f\u7528\uff0c\u80fd\u663e\u8457\u63d0\u5347\u6570\u636e\u5904\u7406\u7684\u901f\u5ea6\u4e0e\u51c6\u786e\u7387\u3002<\/p>\n","protected":false},"excerpt":{"rendered":"<p>\u524d\u8a00 \u5728\u65e5\u5e38\u7684\u5f00\u53d1\u8fd0\u7ef4\u8fc7\u7a0b\u4e2d\uff0c\u6211\u4eec\u7ecf\u5e38\u9700\u8981\u5224\u65ad\u4e24\u4e2a\u6587\u4ef6\u6216\u76ee\u5f55\u7684\u5dee\u5f02\u3002\u8fd9\u65f6\uff0cLinux \u7cfb\u7edf\u81ea\u5e26\u7684 diff \u547d\u4ee4\u5c31\u663e\u5f97\u683c\u5916\u5f3a\u5927\u548c\u5b9e\u7528\u3002\u672c\u6587\u5c06\u8be6\u7ec6\u4ecb\u7ecd diff \u7684\u7528\u6cd5\u3001\u8f93\u51fa\u683c\u5f0f\u4ee5\u53ca\u5b9e\u6218\u6280\u5de7\uff0c\u5e2e\u52a9\u60a8\u66f4\u9ad8\u6548\u5730\u5904\u7406\u914d\u7f6e\u53d8\u66f4\u548c\u7248\u672c\u5bf9\u6bd4\u7b49\u4efb\u52a1\u3002 \u4e00\u3001diff \u547d\u4ee4\u6982\u8ff0 diff \u662f Linux\/Unix \u73af\u5883\u4e2d\u7528\u4e8e\u6bd4\u8f83\u4e24\u4e2a\u6587\u4ef6\u6216\u76ee\u5f55\u5185\u5bb9\u5dee\u5f02\u7684\u5de5\u5177\u3002\u5b83\u80fd\u7cbe\u51c6\u5730\u6307\u51fa\u54ea\u4e9b\u884c\u53d1\u751f\u4e86\u66f4\u6539\uff08\u65b0\u589e\u3001\u5220\u9664\u6216\u4fee\u6539\uff09\uff0c\u5e76\u4ee5\u591a\u79cd\u683c\u5f0f\u5448\u73b0\uff0c\u9002\u7528\u4e8e\u4ee3\u7801\u5ba1\u67e5\u3001\u914d\u7f6e\u6bd4\u5bf9\u7b49\u573a\u666f\u3002 \u5728\u4f7f\u7528\u8fdc\u7a0b\u670d\u52a1\u5668\u8fdb\u884c\u81ea\u52a8\u5316\u90e8\u7f72\u3001\u7248\u672c\u63a7\u5236\u65f6\uff0c\u914d\u5408\u9ad8\u6027\u80fd\u7684\u7f8e\u56fd\u4e91\u670d\u52a1\u5668\u53ef\u4ee5\u663e\u8457\u63d0\u5347\u5904\u7406\u6548\u7387\u4e0e\u6570\u636e\u4e00\u81f4\u6027\u3002 \u4e8c\u3001\u57fa\u7840\u8bed\u6cd5\u7ed3\u6784 diff [\u9009\u9879] \u6587\u4ef61 \u6587\u4ef62 \u6587\u4ef61 \u901a\u5e38\u8868\u793a\u65e7\u7248\u672c\u5185\u5bb9 \u6587\u4ef62 \u662f\u5f53\u524d\u6216\u4fee\u6539\u540e\u7684\u7248\u672c \u793a\u4f8b\uff1a\u5355\u6587\u4ef6\u5dee\u5f02\u6bd4\u8f83 \u521b\u5efa\u4e24\u4e2a\u6837\u4f8b\u6587\u672c\u6587\u4ef6\uff1a echo -e &#8220;apple\\nbanana\\ncherry\\ndate&#8221; &gt; fruits1.txt echo -e &#8220;apple\\nblueberry\\ncherry\\nfig&#8221; &gt; fruits2.txt \u6267\u884c\u5bf9\u6bd4\u547d\u4ee4\uff1a diff fruits1.txt fruits2.txt \u8f93\u51fa\u7ed3\u679c\u5982\u4e0b\uff1a 2c2 &lt; banana &#8212; &gt; blueberry 4c4 &lt; date &#8212; &gt; fig \u8fd9\u91cc\uff0c\u201c2c2\u201d \u8868\u793a\u7b2c2\u884c\u5185\u5bb9\u53d1\u751f\u4e86\u66f4\u6539\uff0c\u201c&lt;\u201d\u548c\u201c&gt;\u201d\u5206\u522b\u6807\u793a\u4e24\u4e2a\u6587\u4ef6\u4e2d\u7684\u4e0d\u540c\u5185\u5bb9\u3002 \u4e09\u3001\u76ee\u5f55\u7ea7\u522b\u6bd4\u8f83\u6280\u5de7 [&hellip;]<\/p>\n","protected":false},"author":1,"featured_media":0,"comment_status":"closed","ping_status":"closed","sticky":false,"template":"","format":"standard","meta":{"footnotes":""},"categories":[8],"tags":[],"class_list":["post-68638","post","type-post","status-publish","format-standard","hentry","category-os"],"_links":{"self":[{"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/posts\/68638","targetHints":{"allow":["GET"]}}],"collection":[{"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/comments?post=68638"}],"version-history":[{"count":1,"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/posts\/68638\/revisions"}],"predecessor-version":[{"id":68640,"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/posts\/68638\/revisions\/68640"}],"wp:attachment":[{"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/media?parent=68638"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/categories?post=68638"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/fwq.ai\/blog\/wp-json\/wp\/v2\/tags?post=68638"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}