summaryrefslogtreecommitdiffstats
path: root/diff-options.txt
diff options
context:
space:
mode:
authorJunio C Hamano <junio@kernel.org>2010-03-03 05:13:12 +0000
committerJunio C Hamano <junio@kernel.org>2010-03-03 05:13:12 +0000
commit4aa0bccc4a84ed806fa27aefcb79e56e508dc6c9 (patch)
treecda77a5862862e75ef52e0658674a70c4143bd80 /diff-options.txt
parentbf43344465f332611b6ae190bc6ac4eedb9cfba3 (diff)
downloadgit-htmldocs-4aa0bccc4a84ed806fa27aefcb79e56e508dc6c9.tar.gz
Autogenerated HTML docs for v1.7.0.1-138-ga75b
Diffstat (limited to 'diff-options.txt')
-rw-r--r--diff-options.txt4
1 files changed, 3 insertions, 1 deletions
diff --git a/diff-options.txt b/diff-options.txt
index 8707d0e74..60e922e6e 100644
--- a/diff-options.txt
+++ b/diff-options.txt
@@ -117,12 +117,14 @@ any of those replacements occurred.
option and lists the commits in that commit range like the 'summary'
option of linkgit:git-submodule[1] does.
---color::
+--color[=<when>]::
Show colored diff.
+ The value must be always (the default), never, or auto.
--no-color::
Turn off colored diff, even when the configuration file
gives the default to color output.
+ Same as `--color=never`.
--color-words[=<regex>]::
Show colored word diff, i.e., color words which have changed.