Skip to content

Commit

Permalink
Doc update for context diff support
Browse files Browse the repository at this point in the history
  • Loading branch information
ymattw committed Mar 22, 2013
1 parent 91c9df1 commit 18985c1
Showing 1 changed file with 9 additions and 5 deletions.
14 changes: 9 additions & 5 deletions README.rst
Expand Up @@ -107,13 +107,16 @@ Pipe in a diff:
svn diff -r1234 | cdiff -s # view svn diff comparing to given revision
diff -u file1 file2 | cdiff # view diff between two files (note the '-u')
diff -ur dir1 dir2 | cdiff # view diff between two dirs
cat foo.patch | cdiff # view a unified patch (or cdiff < foo.path)
# View a GitHub pull request, side by side (GitHub web interface is missing
# this feature :)
#
# View diff in a GitHub pull request, side by side
curl https://github.com/ymattw/cdiff/pull/11.diff | cdiff -s
# View a patch file in unified or context format, the latter depends on
# command `filterdiff` from package `patchutils` which is available in
# major Linux distros and MacPorts. "cdiff < foo.path" works too.
#
cat foo.patch | cdiff
Redirect output to another patch file is safe:

.. code:: sh
Expand All @@ -125,7 +128,8 @@ Notes

Cdiff has following known issues:

- Only takes unified diff for input
- Does not recognize `normal` diff, and depends on ``filterdiff`` (patchutils)
to read `context` diff
- Side by side mode has alignment problem for wide chars
- Terminal might be in a mess on exception (type ``reset`` can fix it)

Expand Down

0 comments on commit 18985c1

Please sign in to comment.