|
@@ -72,12 +72,14 @@ Read diff from local modification in a *svn*, *git*, or *hg* workspace:
|
72
|
72
|
cdiff -s # view side by side
|
73
|
73
|
cdiff -s -w 90 # use text width 90 other than default 80
|
74
|
74
|
|
75
|
|
-Read the log (e.g. ``git log -p``) in a svn, git, or hg workspace:
|
|
75
|
+Read the log (e.g. ``git log -p``) in a *svn*, *git*, or *hg* workspace:
|
76
|
76
|
|
77
|
77
|
.. code:: sh
|
78
|
78
|
|
79
|
79
|
cd proj-workspace
|
80
|
80
|
cdiff -l
|
|
81
|
+ cdiff -ls # equivalent to ``cdiff -l -s``
|
|
82
|
+ cdiff -ls -w90
|
81
|
83
|
|
82
|
84
|
Pipe in a diff:
|
83
|
85
|
|
|
@@ -115,11 +117,7 @@ Notes
|
115
|
117
|
2.4.3, maybe you can fix it)
|
116
|
118
|
- Only takes unified diff for input
|
117
|
119
|
- Side by side mode has alignment problem for wide chars
|
118
|
|
-
|
119
|
|
-Pull request is very welcome, make sure run ``make test`` and ``make test3`` to
|
120
|
|
-verify. Single commit in pull request would make it easier for review, for
|
121
|
|
-example to collapse last 3 commits into 1 before *push*, use ``git rebase -i
|
122
|
|
-HEAD~3``, *pick* the first and *squash* the other two.
|
|
120
|
+- Pull requests are very welcome (please run ``make test test3`` to verify)
|
123
|
121
|
|
124
|
122
|
See also
|
125
|
123
|
--------
|