diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-08-12 19:24:47 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-08-12 19:24:47 -0700 |
| commit | edbda4d6af7404c97c62ab6af86edf525020cf51 (patch) | |
| tree | 4527bc530f43e5a46adca3b62bd8cb8c07c659c7 /Documentation | |
| parent | 6295ac347acab0f100bc143effd28d3b0bbff739 (diff) | |
| parent | f59a59e22f0005d799fe1d40e0c1f7e5c1f68b76 (diff) | |
| download | git-edbda4d6af7404c97c62ab6af86edf525020cf51.tar.gz git-edbda4d6af7404c97c62ab6af86edf525020cf51.tar.xz | |
Merge branch 'js/color-diff'
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/diff-options.txt | 3 |
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. |