Merge branch 'jc/abbrev-doc'

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

diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
index 706c69bc8267ba3dda85b10a60e56798bbd6863f..2e7a93894c8893f0ded8978391b3098fb1c9b0cf 100644 (file)
--- a/Documentation/diff-options.txt
+++ b/Documentation/diff-options.txt
@@ -36,9 +36,9 @@ endif::git-format-patch[]
 -U<n>::
 --unified=<n>::
        Generate diffs with <n> lines of context instead of
-       the usual three. Implies `--patch`.
+       the usual three.
 ifndef::git-format-patch[]
-       Implies `-p`.
+       Implies `--patch`.
 endif::git-format-patch[]
 
 --output=<file>::
@@ -441,7 +441,10 @@ endif::git-format-patch[]
 
 --binary::
        In addition to `--full-index`, output a binary diff that
-       can be applied with `git-apply`. Implies `--patch`.
+       can be applied with `git-apply`.
+ifndef::git-format-patch[]
+       Implies `--patch`.
+endif::git-format-patch[]
 
 --abbrev[=<n>]::
        Instead of showing the full 40-byte hexadecimal object
@@ -688,6 +691,11 @@ endif::git-format-patch[]
 --ignore-blank-lines::
        Ignore changes whose lines are all blank.
 
+-I<regex>::
+--ignore-matching-lines=<regex>::
+       Ignore changes whose all lines match <regex>.  This option may
+       be specified more than once.
+
 --inter-hunk-context=<lines>::
        Show the context between diff hunks, up to the specified number
        of lines, thereby fusing hunks that are close to each other.