|
@@ -75,7 +75,8 @@ Type ``cdiff -h`` to show usage:
|
75
|
75
|
-l, --log show log with changes from revision control
|
76
|
76
|
-c X, --color=X colorize mode 'auto' (default), 'always', or 'never'
|
77
|
77
|
|
78
|
|
-Read diff from local modification in a *Git/Mercurial/Svn* workspace:
|
|
78
|
+Read diff from local modification in a *Git/Mercurial/Svn* workspace (output
|
|
79
|
+from e.g. ``git diff``, ``svn diff``):
|
79
|
80
|
|
80
|
81
|
.. code:: sh
|
81
|
82
|
|
|
@@ -84,9 +85,10 @@ Read diff from local modification in a *Git/Mercurial/Svn* workspace:
|
84
|
85
|
cdiff -s # view side by side
|
85
|
86
|
cdiff -s -w 90 # use text width 90 other than default 80
|
86
|
87
|
cdiff -s file1 dir2 # view modification of given files/dirs only
|
|
88
|
+ cdiff -s -w90 -- -U10 # pass '-U10' to underneath revision diff tool
|
87
|
89
|
|
88
|
|
-Read the log with changes (e.g. ``git log -p``, ``svn log --diff``) in a
|
89
|
|
-*Git/Mercurial/Svn* workspace (note *--diff* option is new in svn 1.7.0):
|
|
90
|
+Read log with changes in a *Git/Mercurial/Svn* workspace (output from e.g.
|
|
91
|
+``git log -p``, ``svn log --diff``), note *--diff* option is new in svn 1.7.0:
|
90
|
92
|
|
91
|
93
|
.. code:: sh
|
92
|
94
|
|