Merge branch 'jc/doc-diff-filter-exclude'

[git/git.git] / Documentation / diff-options.txt

diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
index 073c7e5..705a873 100644 (file)
--- a/Documentation/diff-options.txt
+++ b/Documentation/diff-options.txt
@@ -26,12 +26,12 @@ ifndef::git-format-patch[]
 ifdef::git-diff[]
        This is the default.
 endif::git-diff[]
 ifdef::git-diff[]
        This is the default.
 endif::git-diff[]

-endif::git-format-patch[]

 
 -s::
 --no-patch::
        Suppress diff output. Useful for commands like `git show` that
        show the patch by default, or to cancel the effect of `--patch`.
 
 -s::
 --no-patch::
        Suppress diff output. Useful for commands like `git show` that
        show the patch by default, or to cancel the effect of `--patch`.

+endif::git-format-patch[]

 
 -U<n>::
 --unified=<n>::
 
 -U<n>::
 --unified=<n>::


@@ -63,6 +63,13 @@ ifndef::git-format-patch[]
        Synonym for `-p --raw`.
 endif::git-format-patch[]
 
        Synonym for `-p --raw`.
 endif::git-format-patch[]
 

+--compaction-heuristic::
+--no-compaction-heuristic::
+       These are to help debugging and tuning an experimental
+       heuristic (which is off by default) that shifts the hunk
+       boundary in an attempt to make the resulting patch easier
+       to read.
+

 --minimal::
        Spend extra time to make sure the smallest possible
        diff is produced.
 --minimal::
        Spend extra time to make sure the smallest possible
        diff is produced.


@@ -267,8 +274,11 @@ expression to make sure that it matches all non-whitespace characters.
 A match that contains a newline is silently truncated(!) at the
 newline.
 +
 A match that contains a newline is silently truncated(!) at the
 newline.
 +

+For example, `--word-diff-regex=.` will treat each character as a word
+and, correspondingly, show differences character by character.
++

 The regex can also be set via a diff driver or configuration option, see
 The regex can also be set via a diff driver or configuration option, see

-linkgit:gitattributes[1] or linkgit:git-config[1].  Giving it explicitly
+linkgit:gitattributes[5] or linkgit:git-config[1].  Giving it explicitly

 overrides any diff driver or configuration setting.  Diff drivers
 override configuration settings.
 
 overrides any diff driver or configuration setting.  Diff drivers
 override configuration settings.
 


@@ -283,14 +293,24 @@ endif::git-format-patch[]
 
 ifndef::git-format-patch[]
 --check::
 
 ifndef::git-format-patch[]
 --check::

-       Warn if changes introduce whitespace errors.  What are
-       considered whitespace errors is controlled by `core.whitespace`
+       Warn if changes introduce conflict markers or whitespace errors.
+       What are considered whitespace errors is controlled by `core.whitespace`

        configuration.  By default, trailing whitespaces (including
        lines that solely consist of whitespaces) and a space character
        that is immediately followed by a tab character inside the
        initial indent of the line are considered whitespace errors.
        Exits with non-zero status if problems are found. Not compatible
        with --exit-code.
        configuration.  By default, trailing whitespaces (including
        lines that solely consist of whitespaces) and a space character
        that is immediately followed by a tab character inside the
        initial indent of the line are considered whitespace errors.
        Exits with non-zero status if problems are found. Not compatible
        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`.
+

 endif::git-format-patch[]
 
 --full-index::
 endif::git-format-patch[]
 
 --full-index::