aboutsummaryrefslogtreecommitdiff
path: root/Documentation/diff-options.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-05-06 10:49:53 -0700
committerJunio C Hamano <gitster@pobox.com>2011-05-06 10:49:53 -0700
commit12b99a3598bddfb26efd188ffac6f0e283f02d5a (patch)
treea0f29d790c353c744bf812b9b306dc03e8921856 /Documentation/diff-options.txt
parentef6b43a44b5e25afe6eee32fcfda7d2a738cec3c (diff)
parent6999c54029b42ea996c2fff4fa37303f79b9d8c2 (diff)
downloadgit-12b99a3598bddfb26efd188ffac6f0e283f02d5a.tar.gz
git-12b99a3598bddfb26efd188ffac6f0e283f02d5a.tar.xz
Merge branch 'mg/diff-uiconfig-doc'
* mg/diff-uiconfig-doc: config.txt,diff-options.txt: porcelain vs. plumbing for color.diff
Diffstat (limited to 'Documentation/diff-options.txt')
-rw-r--r--Documentation/diff-options.txt15
1 files changed, 11 insertions, 4 deletions
diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
index 23b605f9d..9ca565d70 100644
--- a/Documentation/diff-options.txt
+++ b/Documentation/diff-options.txt
@@ -124,12 +124,19 @@ any of those replacements occurred.
--color[=<when>]::
Show colored diff.
- The value must be always (the default), never, or auto.
+ The value must be `always` (the default for `<when>`), `never`, or `auto`.
+ The default value is `never`.
+ifdef::git-diff[]
+ It can be changed by the `color.ui` and `color.diff`
+ configuration settings.
+endif::git-diff[]
--no-color::
- Turn off colored diff, even when the configuration file
- gives the default to color output.
- Same as `--color=never`.
+ Turn off colored diff.
+ifdef::git-diff[]
+ This can be used to override configuration settings.
+endif::git-diff[]
+ It is the same as `--color=never`.
--word-diff[=<mode>]::
Show a word diff, using the <mode> to delimit changed words.