|
@@ -14,9 +14,9 @@ whatever directory which is in your `$PATH`, for example, `$HOME/bin` is in my
|
14
|
14
|
|
15
|
15
|
curl -ksS https://raw.github.com/ymattw/cdiff/master/src/cdiff.py > ~/bin/cdiff
|
16
|
16
|
chmod +x ~/bin/cdiff
|
17
|
|
-
|
|
17
|
+
|
18
|
18
|
## Usage
|
19
|
|
-
|
|
19
|
+
|
20
|
20
|
Just give it a diff (patch) file or pipe a diff to it. Use option `-s` for
|
21
|
21
|
side-by-side view, and option `-w N` to set a text width other than default
|
22
|
22
|
`80`. See examples below
|
|
@@ -26,16 +26,15 @@ View a diff (patch) file:
|
26
|
26
|
cdiff foo.patch # view incremental, colored udiff
|
27
|
27
|
cdiff foo.patch -s # view in side by side mode
|
28
|
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
|
38
|
git log -p -2 | cdiff -s
|
40
|
39
|
git show <commit> | cdiff -s
|
41
|
40
|
|