|
|
|
|
1
|
Cdiff
|
1
|
Cdiff
|
2
|
=====
|
2
|
=====
|
3
|
|
3
|
|
|
|
4
|
+.. image:: https://travis-ci.org/ymattw/cdiff.png?branch=master
|
|
|
5
|
+ :target: https://travis-ci.org/ymattw/cdiff
|
|
|
6
|
+ :alt: Build status
|
|
|
7
|
+
|
4
|
Term based tool to view **colored**, **incremental** diff in *git/svn/hg*
|
8
|
Term based tool to view **colored**, **incremental** diff in *git/svn/hg*
|
5
|
workspace, given patch or two files, or from stdin, with **side by side** and
|
9
|
workspace, given patch or two files, or from stdin, with **side by side** and
|
6
|
**auto pager** support. Requires python (>= 2.5.0) and ``less``.
|
10
|
**auto pager** support. Requires python (>= 2.5.0) and ``less``.
|
|
|
|
|
108
|
- Only takes unified diff for input
|
112
|
- Only takes unified diff for input
|
109
|
- Side by side mode has alignment problem for wide chars
|
113
|
- Side by side mode has alignment problem for wide chars
|
110
|
|
114
|
|
111
|
-Pull request is very welcome, make sure run ``make test`` to verify. It only
|
|
|
112
|
-has minimal verification today and that depends on human eyes too (`issue #7
|
|
|
113
|
-<https://github.com/ymattw/cdiff/issues/7>`_). Single commit in pull request
|
|
|
114
|
-would make it easier for review, for example to collapse last 3 commits into 1
|
|
|
115
|
-before *push*, use ``git rebase -i HEAD~3``, *pick* the first and *squash* the
|
|
|
116
|
-other two.
|
|
|
|
|
115
|
+Pull request is very welcome, make sure run ``make test`` to verify. Single
|
|
|
116
|
+commit in pull request would make it easier for review, for example to collapse
|
|
|
117
|
+last 3 commits into 1 before *push*, use ``git rebase -i HEAD~3``, *pick* the
|
|
|
118
|
+first and *squash* the other two.
|
117
|
|
119
|
|
118
|
See also
|
120
|
See also
|
119
|
--------
|
121
|
--------
|