|
|
|
|
73
|
-l, --log show log with changes from revision control
|
73
|
-l, --log show log with changes from revision control
|
74
|
-c M, --color=M colorize mode 'auto' (default), 'always', or 'never'
|
74
|
-c M, --color=M colorize mode 'auto' (default), 'always', or 'never'
|
75
|
|
75
|
|
|
|
76
|
+ Note:
|
|
|
77
|
+ Option parser will stop on first unknown option and pass them down to
|
|
|
78
|
+ underneath revision control
|
|
|
79
|
+
|
76
|
Read diff from local modification in a *Git/Mercurial/Svn* workspace (output
|
80
|
Read diff from local modification in a *Git/Mercurial/Svn* workspace (output
|
77
|
from e.g. ``git diff``, ``svn diff``):
|
81
|
from e.g. ``git diff``, ``svn diff``):
|
78
|
|
82
|
|
|
|
|
|
84
|
cdiff -s -w 90 # use text width 90 other than default 80
|
88
|
cdiff -s -w 90 # use text width 90 other than default 80
|
85
|
cdiff -s file1 dir2 # view modification of given files/dirs only
|
89
|
cdiff -s file1 dir2 # view modification of given files/dirs only
|
86
|
cdiff -s -w90 -- -U10 # pass '-U10' to underneath revision diff tool
|
90
|
cdiff -s -w90 -- -U10 # pass '-U10' to underneath revision diff tool
|
|
|
91
|
+ cdiff -s -w90 -U10 # '--' is optional as it's unknown to cdiff
|
|
|
92
|
+ cdiff -s --cached # show git staged diff (git diff --cached)
|
|
|
93
|
+ cdiff -s -r1234 # show svn diff to revision 1234
|
87
|
|
94
|
|
88
|
Read log with changes in a *Git/Mercurial/Svn* workspace (output from e.g.
|
95
|
Read log with changes in a *Git/Mercurial/Svn* workspace (output from e.g.
|
89
|
``git log -p``, ``svn log --diff``), note *--diff* option is new in svn 1.7.0:
|
96
|
``git log -p``, ``svn log --diff``), note *--diff* option is new in svn 1.7.0:
|