Better word-diff for Git and SVN.
Add everything to your $PATH
. Make sure you have wdiff
installed.
Use gitwdiff ...
instead of git diff ...
.
Use svnwdiff ...
instead of svn diff ...
.
For the best results, copy the settings from gitconfig-example
to
your ~/.gitconfig
. After that:
-
Long lines are wrapped in the output (no horizontal scrolling in the pager).
-
The usual Git commands such as
git diff
,git show
, andgit status
will use colours that are similar to the colour scheme ofgitwdiff
.
Git uses a pager by default. With SVN, you can try this:
svnwdiff ... | less -R
More examples at: https://github.com/suomela/gitwdiff/tree/examples/example
wdiff - https://www.gnu.org/software/wdiff/
Try gitwdiff1
or gitwdiff2
for alternative colour schemes.
See https://en.wikipedia.org/wiki/ANSI_escape_code for the colour codes.