diff --git a/Documentation/diff-options.adoc b/Documentation/diff-options.adoc index 8a63b5e164114a..665473e61a97fb 100644 --- a/Documentation/diff-options.adoc +++ b/Documentation/diff-options.adoc @@ -457,6 +457,11 @@ endif::git-diff[] + Note that despite the name of the first mode, color is used to highlight the changed parts in all modes if enabled. ++ +Word diff works by finding word-level changes within each hunk of +the line-level diff. The line-level alignment determines which +changed lines are compared to each other, which can affect the +word-level output. `--word-diff-regex=`:: Use __ to decide what a word is, instead of considering