|
@@ -73,7 +73,7 @@ Type ``cdiff -h`` to show usage:
|
73
|
73
|
-s, --side-by-side enable side-by-side mode
|
74
|
74
|
-w N, --width=N set text width for side-by-side mode, default is 80
|
75
|
75
|
-l, --log show log with changes from revision control
|
76
|
|
- -c X, --color=X colorize mode 'auto' (default), 'always', or 'never'
|
|
76
|
+ -c M, --color=M colorize mode 'auto' (default), 'always', or 'never'
|
77
|
77
|
|
78
|
78
|
Read diff from local modification in a *Git/Mercurial/Svn* workspace (output
|
79
|
79
|
from e.g. ``git diff``, ``svn diff``):
|
|
@@ -113,9 +113,9 @@ Pipe in a diff:
|
113
|
113
|
|
114
|
114
|
# View a patch file in unified or context format, the latter depends on
|
115
|
115
|
# command `filterdiff` from package `patchutils` which is available in
|
116
|
|
- # major Linux distros and MacPorts. "cdiff < foo.path" works too.
|
|
116
|
+ # major Linux distros and MacPorts.
|
117
|
117
|
#
|
118
|
|
- cat foo.patch | cdiff
|
|
118
|
+ cdiff -s < foo.patch
|
119
|
119
|
|
120
|
120
|
Redirect output to another patch file is safe:
|
121
|
121
|
|
|
@@ -136,7 +136,8 @@ Cdiff has following known issues:
|
136
|
136
|
Pull requests are very welcome, please make sure your changes can pass unit
|
137
|
137
|
tests and regression tests by run ``make test`` (required tool *coverage* can
|
138
|
138
|
be installed with ``pip install coverage``). Also watch out `travis build
|
139
|
|
-<https://travis-ci.org/ymattw/cdiff>`_ after push, make sure it passes as well.
|
|
139
|
+<https://travis-ci.org/ymattw/cdiff/pull_requests>`_ after push, make sure it
|
|
140
|
+passes as well.
|
140
|
141
|
|
141
|
142
|
See also
|
142
|
143
|
--------
|