aboutsummaryrefslogtreecommitdiff
path: root/Documentation/diff-options.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-05-26 09:41:11 -0700
committerJunio C Hamano <gitster@pobox.com>2011-05-26 09:41:11 -0700
commit5f8937db39c4eb495a48931172348200a91821a3 (patch)
tree7c34918c45f02e8543c910c16dbf51d69913727c /Documentation/diff-options.txt
parentb73f3d2c7db2e4d9f02ff9d24852685bcb6fa38a (diff)
parent6999c54029b42ea996c2fff4fa37303f79b9d8c2 (diff)
downloadgit-5f8937db39c4eb495a48931172348200a91821a3.tar.gz
git-5f8937db39c4eb495a48931172348200a91821a3.tar.xz
Merge branch 'mg/diff-uiconfig-doc' into maint
* 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 c32105f1e..80fd817c2 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.