summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-08-13 02:24:47 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-08-13 02:24:47 (GMT)
commitedbda4d6af7404c97c62ab6af86edf525020cf51 (patch)
tree4527bc530f43e5a46adca3b62bd8cb8c07c659c7 /Documentation
parent6295ac347acab0f100bc143effd28d3b0bbff739 (diff)
parentf59a59e22f0005d799fe1d40e0c1f7e5c1f68b76 (diff)
downloadgit-edbda4d6af7404c97c62ab6af86edf525020cf51.zip
git-edbda4d6af7404c97c62ab6af86edf525020cf51.tar.gz
git-edbda4d6af7404c97c62ab6af86edf525020cf51.tar.bz2
Merge branch 'js/color-diff'
Diffstat (limited to 'Documentation')
-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 47ba9a4..b5d9763 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.