-
Notifications
You must be signed in to change notification settings - Fork 419
Expand file tree
/
Copy pathdiff.html
More file actions
120 lines (101 loc) · 8.78 KB
/
Copy pathdiff.html
File metadata and controls
120 lines (101 loc) · 8.78 KB
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>4.13. 文件比较</title><link rel="stylesheet" type="text/css" href="../docbook.css" /><meta name="generator" content="DocBook XSL Stylesheets Vsnapshot" /><meta name="keywords" content="shell,bash,zsh, awk,sed,curl,expect, grep,sort" /><link rel="home" href="../index.html" title="Netkiller Shell 手札" /><link rel="up" href="index.html" title="第 4 章 Shell 命令" /><link rel="prev" href="binary.html" title="4.12. 进制转换 - 16进制 - 8进制 - 二进制" /><link rel="next" href="ed.html" title="4.14. ed, red - text editor" /></head><body><a xmlns="" href="//www.netkiller.cn/">Home</a> | <a xmlns="" href="//netkiller.github.io/">简体中文</a> | <a xmlns="" href="http://netkiller.sourceforge.net/">繁体中文</a> | <a xmlns="" href="/journal/index.html">杂文</a>
| <a xmlns="" href="https://github.com/netkiller">Github</a> | <a xmlns="" href="https://zhuanlan.zhihu.com/netkiller">知乎专栏</a> | <a xmlns="" href="https://www.facebook.com/bg7nyt">Facebook</a> | <a xmlns="" href="http://cn.linkedin.com/in/netkiller/">Linkedin</a> | <a xmlns="" href="https://www.youtube.com/user/bg7nyt/videos">Youtube</a> | <a xmlns="" href="//www.netkiller.cn/home/donations.html">打赏(Donations)</a> | <a xmlns="" href="//www.netkiller.cn/home/about.html">About</a><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">4.13. 文件比较</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="binary.html">上一页</a> </td><th width="60%" align="center">第 4 章 Shell 命令</th><td width="20%" align="right"> <a accesskey="n" href="ed.html">下一页</a></td></tr></table><hr /></div><table xmlns=""><tr><td><iframe src="//ghbtns.com/github-btn.html?user=netkiller&repo=netkiller.github.io&type=watch&count=true&size=large" height="30" width="170" frameborder="0" scrolling="0" style="width:170px; height: 30px;" allowTransparency="true"></iframe></td><td><iframe src="//ghbtns.com/github-btn.html?user=netkiller&repo=netkiller.github.io&type=fork&count=true&size=large" height="30" width="170" frameborder="0" scrolling="0" style="width:170px; height: 30px;" allowTransparency="true"></iframe></td><td><iframe src="//ghbtns.com/github-btn.html?user=netkiller&type=follow&count=true&size=large" height="30" width="240" frameborder="0" scrolling="0" style="width:240px; height: 30px;" allowTransparency="true"></iframe></td><td></td><td><a href="https://zhuanlan.zhihu.com/netkiller"><img src="/images/logo/zhihu-card-default.svg" height="25" /></a></td><td valign="middle"><a href="https://zhuanlan.zhihu.com/netkiller">知乎专栏</a></td><td></td><td></td><td></td><td></td></tr></table><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="diff"></a>4.13. 文件比较</h2></div></div></div>
<div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="id898"></a>4.13.1. diff</h3></div></div></div>
<pre class="screen">
usage: diff [-aBbdilpTtw] [-c | -e | -f | -n | -q | -u] [--ignore-case]
[--no-ignore-case] [--normal] [--strip-trailing-cr] [--tabsize]
[-I pattern] [-F pattern] [-L label] file1 file2
diff [-aBbdilpTtw] [-I pattern] [-L label] [--ignore-case]
[--no-ignore-case] [--normal] [--strip-trailing-cr] [--tabsize]
[-F pattern] -C number file1 file2
diff [-aBbdiltw] [-I pattern] [--ignore-case] [--no-ignore-case]
[--normal] [--strip-trailing-cr] [--tabsize] -D string file1 file2
diff [-aBbdilpTtw] [-I pattern] [-L label] [--ignore-case]
[--no-ignore-case] [--normal] [--tabsize] [--strip-trailing-cr]
[-F pattern] -U number file1 file2
diff [-aBbdilNPprsTtw] [-c | -e | -f | -n | -q | -u] [--ignore-case]
[--no-ignore-case] [--normal] [--tabsize] [-I pattern] [-L label]
[-F pattern] [-S name] [-X file] [-x pattern] dir1 dir2
diff [-aBbditwW] [--expand-tabs] [--ignore-all-blanks]
[--ignore-blank-lines] [--ignore-case] [--minimal]
[--no-ignore-file-name-case] [--strip-trailing-cr]
[--suppress-common-lines] [--tabsize] [--text] [--width]
-y | --side-by-side file1 file2
diff [--help] [--version]
</pre>
</div>
<div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="id899"></a>4.13.2. sdiff</h3></div></div></div>
<pre class="screen">
usage: sdiff [-abdilstW] [-I regexp] [-o outfile] [-w width] file1 file2
-l, --left-column: only print the left column for identical lines.
-o OUTFILE, --output=OUTFILE: interactively merge file1 and file2 into outfile.
-s, --suppress-common-lines: skip identical lines.
-w WIDTH, --width=WIDTH: print a maximum of WIDTH characters on each line.
Options passed to diff(1) are:
-a, --text: treat file1 and file2 as text files.
-b, --ignore-trailing-cr: ignore trailing blank spaces.
-d, --minimal: minimize diff size.
-I RE, --ignore-matching-lines=RE: ignore changes whose line matches RE.
-i, --ignore-case: do a case-insensitive comparison.
-t, --expand-tabs: sxpand tabs to spaces.
-W, --ignore-all-spaces: ignore all spaces.
--speed-large-files: assume large file with scattered changes.
--strip-trailing-cr: strip trailing carriage return.
--ignore-file-name-case: ignore case of file names.
--no-ignore-file-name-case: do not ignore file name case
--tabsize NUM: change size of tabs (default 8.)
--diff-program=PROGRAM: Use PROGRAM to compare files.
</pre>
</div>
<div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="id900"></a>4.13.3. diff3</h3></div></div></div>
<pre class="screen">
Usage: diff3 [OPTION]... MYFILE OLDFILE YOURFILE
Compare three files line by line.
-e --ed Output unmerged changes from OLDFILE to YOURFILE into MYFILE.
-E --show-overlap Output unmerged changes, bracketing conflicts.
-A --show-all Output all changes, bracketing conflicts.
-x --overlap-only Output overlapping changes.
-X Output overlapping changes, bracketing them.
-3 --easy-only Output unmerged nonoverlapping changes.
-m --merge Output merged file instead of ed script (default -A).
-L LABEL --label=LABEL Use LABEL instead of file name.
-i Append `w' and `q' commands to ed scripts.
-a --text Treat all files as text.
-T --initial-tab Make tabs line up by prepending a tab.
--diff-program=PROGRAM Use PROGRAM to compare files.
-v --version Output version info.
--help Output this help.
If a FILE is `-', read standard input.
Report bugs to <bug-gnu-utils@gnu.org>.
</pre>
</div>
</div><script xmlns="" type="text/javascript" id="clustrmaps" src="//cdn.clustrmaps.com/map_v2.js?u=r5HG&d=9mi5r_kkDC8uxG8HuY3p4-2qgeeVypAK9vMD-2P6BYM"></script><div class="navfooter"><hr /><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="binary.html">上一页</a> </td><td width="20%" align="center"><a accesskey="u" href="index.html">上一级</a></td><td width="40%" align="right"> <a accesskey="n" href="ed.html">下一页</a></td></tr><tr><td width="40%" align="left" valign="top">4.12. 进制转换 - 16进制 - 8进制 - 二进制 </td><td width="20%" align="center"><a accesskey="h" href="../index.html">起始页</a></td><td width="40%" align="right" valign="top"> 4.14. ed, red - text editor</td></tr></table></div><script xmlns="">
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
})(window,document,'script','//www.google-analytics.com/analytics.js','ga');
ga('create', 'UA-11694057-1', 'auto');
ga('send', 'pageview');
</script><script xmlns="" async="async">
var _hmt = _hmt || [];
(function() {
var hm = document.createElement("script");
hm.src = "https://hm.baidu.com/hm.js?93967759a51cda79e49bf4e34d0b0f2c";
var s = document.getElementsByTagName("script")[0];
s.parentNode.insertBefore(hm, s);
})();
</script><script xmlns="" async="async">
(function(){
var bp = document.createElement('script');
var curProtocol = window.location.protocol.split(':')[0];
if (curProtocol === 'https') {
bp.src = 'https://zz.bdstatic.com/linksubmit/push.js';
}
else {
bp.src = 'http://push.zhanzhang.baidu.com/push.js';
}
var s = document.getElementsByTagName("script")[0];
s.parentNode.insertBefore(bp, s);
})();
</script></body></html>