Steven Myint 11 лет назад
Родитель
Сommit
7f63801181
1 измененных файлов: 9 добавлений и 10 удалений
  1. 9
    10
      README.md

+ 9
- 10
README.md Просмотреть файл

14
 
14
 
15
     curl -ksS https://raw.github.com/ymattw/cdiff/master/src/cdiff.py > ~/bin/cdiff
15
     curl -ksS https://raw.github.com/ymattw/cdiff/master/src/cdiff.py > ~/bin/cdiff
16
     chmod +x ~/bin/cdiff
16
     chmod +x ~/bin/cdiff
17
-    
17
+
18
 ## Usage
18
 ## Usage
19
-    
19
+
20
 Just give it a diff (patch) file or pipe a diff to it.  Use option `-s` for
20
 Just give it a diff (patch) file or pipe a diff to it.  Use option `-s` for
21
 side-by-side view, and option `-w N` to set a text width other than default
21
 side-by-side view, and option `-w N` to set a text width other than default
22
 `80`.  See examples below
22
 `80`.  See examples below
26
     cdiff foo.patch             # view incremental, colored udiff
26
     cdiff foo.patch             # view incremental, colored udiff
27
     cdiff foo.patch -s          # view in side by side mode
27
     cdiff foo.patch -s          # view in side by side mode
28
     cdiff foo.patch -s -w 90    # use text width 90 other than default 80
28
     cdiff foo.patch -s -w 90    # use text width 90 other than default 80
29
-    
30
-Read diff from svn:
31
 
29
 
32
-    svn diff | cdiff
33
-    svn diff | cdiff -s
34
-    svn diff | cdiff -s -w 90
35
-    
36
-Read diff from git:
30
+Read diff from svn, git, or hg:
31
+
32
+    cdiff
33
+    cdiff -s
34
+    cdiff -s -w 90
35
+
36
+Read diffs in git logs:
37
 
37
 
38
-    git diff | cdiff -s
39
     git log -p -2 | cdiff -s
38
     git log -p -2 | cdiff -s
40
     git show <commit> | cdiff -s
39
     git show <commit> | cdiff -s
41
 
40