From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 11 Aug 2017 20:27:04 +0000 (-0700)
Subject: Merge branch 'ah/doc-wserrorhighlight'
X-Git-Tag: v2.15.0-rc0~193
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/4c244c25f044b62d2555746d947249215e7c55a7?hp=-c

Merge branch 'ah/doc-wserrorhighlight'

Doc update.

* ah/doc-wserrorhighlight:
doc: add missing values "none" and "default" for diff.wsErrorHighlight
---

4c244c25f044b62d2555746d947249215e7c55a7
diff --combined Documentation/diff-options.txt
index 43d18a4c5c,5cc7c7eb71..56dedafcd4
--- a/Documentation/diff-options.txt
+++ b/Documentation/diff-options.txt
@@@ -192,9 -192,10 +192,9 @@@ ifndef::git-log[
  	given, do not munge pathnames and use NULs as output field terminators.
  endif::git-log[]
  +
 -Without this option, each pathname output will have TAB, LF, double quotes,
 -and backslash characters replaced with `\t`, `\n`, `\"`, and `\\`,
 -respectively, and the pathname will be enclosed in double quotes if
 -any of those replacements occurred.
 +Without this option, pathnames with "unusual" characters are quoted as
 +explained for the configuration variable `core.quotePath` (see
 +linkgit:git-config[1]).
  
  --name-only::
  	Show only names of changed files.
@@@ -300,15 -301,14 +300,14 @@@ ifndef::git-format-patch[
  	with --exit-code.
  
  --ws-error-highlight=<kind>::
- 	Highlight whitespace errors on lines specified by <kind>
- 	in the color specified by `color.diff.whitespace`.  <kind>
- 	is a comma separated list of `old`, `new`, `context`.  When
- 	this option is not given, only whitespace errors in `new`
- 	lines are highlighted.  E.g. `--ws-error-highlight=new,old`
- 	highlights whitespace errors on both deleted and added lines.
- 	`all` can be used as a short-hand for `old,new,context`.
- 	The `diff.wsErrorHighlight` configuration variable can be
- 	used to specify the default behaviour.
+ 	Highlight whitespace errors in the `context`, `old` or `new`
+ 	lines of the diff.  Multiple values are separated by comma,
+ 	`none` resets previous values, `default` reset the list to
+ 	`new` and `all` is a shorthand for `old,new,context`.  When
+ 	this option is not given, and the configuration variable
+ 	`diff.wsErrorHighlight` is not set, only whitespace errors in
+ 	`new` lines are highlighted. The whitespace errors are colored
+ 	whith `color.diff.whitespace`.
  
  endif::git-format-patch[]
  
@@@ -392,7 -392,7 +391,7 @@@ endif::git-log[
  	the diff between the preimage and `/dev/null`. The resulting patch
  	is not meant to be applied with `patch` or `git apply`; this is
  	solely for people who want to just concentrate on reviewing the
 -	text after the change. In addition, the output obviously lack
 +	text after the change. In addition, the output obviously lacks
  	enough information to apply such a patch in reverse, even manually,
  	hence the name of the option.
  +