From: Thomas Rast <trast@student.ethz.ch>
Date: Wed, 14 Apr 2010 15:59:06 +0000 (+0200)
Subject: diff: add --word-diff option that generalizes --color-words
X-Git-Tag: v1.7.2-rc0~124^2
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/882749a04f828fccd795deec4d0bf10ba09ae549?hp=882749a04f828fccd795deec4d0bf10ba09ae549

diff: add --word-diff option that generalizes --color-words

This teaches the --color-words engine a more general interface that
supports two new modes:

* --word-diff=plain, inspired by the 'wdiff' utility (most similar to
'wdiff -n <old> <new>'): uses delimiters [-removed-] and {+added+}

* --word-diff=porcelain, which generates an ad-hoc machine readable
format:
- each diff unit is prefixed by [-+ ] and terminated by newline as
in unified diff
- newlines in the input are output as a line consisting only of a
tilde '~'

Both of these formats still support color if it is enabled, using it
to highlight the differences.  --color-words becomes a synonym for
--word-diff=color, which is the color-only format.  Also adds some
compatibility/convenience options.

Thanks to Junio C Hamano and Miles Bader for good ideas.

Signed-off-by: Thomas Rast <trast@student.ethz.ch>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---