Merge branch 'rs/ring-buffer-wraparound'

diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
index 2d77a196269b2d50de9c661fa8869badf155730a..29630c238912ef9b70ee1a8e9f3906a4d1f63ddd 100644 (file)
--- a/Documentation/diff-options.txt
+++ b/Documentation/diff-options.txt
@@ -308,6 +308,8 @@ ifndef::git-format-patch[]
        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.
 
 endif::git-format-patch[]