aboutsummaryrefslogtreecommitdiff
path: root/Documentation/diff-options.txt
diff options
context:
space:
mode:
authorJohannes Schindelin <Johannes.Schindelin@gmx.de>2006-07-28 23:56:15 +0200
committerJunio C Hamano <junkio@cox.net>2006-08-10 15:28:57 -0700
commitf59a59e22f0005d799fe1d40e0c1f7e5c1f68b76 (patch)
treee0390f65a2bfe3b1d1f3468e2a6cbe302dabea70 /Documentation/diff-options.txt
parent65cdb5f1658c4911b3f17a2e99332e5397c52240 (diff)
downloadgit-f59a59e22f0005d799fe1d40e0c1f7e5c1f68b76.tar.gz
git-f59a59e22f0005d799fe1d40e0c1f7e5c1f68b76.tar.xz
Add the --color-words option to the diff options family
With this option, the changed words are shown inline. For example, if a file containing "This is foo" is changed to "This is bar", the diff will now show "This is " in plain text, "foo" in red, and "bar" in green. Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation/diff-options.txt')
-rw-r--r--Documentation/diff-options.txt3
1 files changed, 3 insertions, 0 deletions
diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
index 47ba9a403..b5d976359 100644
--- a/Documentation/diff-options.txt
+++ b/Documentation/diff-options.txt
@@ -36,6 +36,9 @@
Turn off colored diff, even when the configuration file
gives the default to color output.
+--color-words::
+ Show colored word diff, i.e. color words which have changed.
+
--no-renames::
Turn off rename detection, even when the configuration
file gives the default to do so.