Merge branch 'so/format-patch-doc-on-default-diff-format'

Docfix.

* so/format-patch-doc-on-default-diff-format:
  doc/diff-options: fix out of place mentions of '--patch/-p'

diff --combined Documentation/diff-options.txt
index ee52b65e4613b7dedf76ddb5278e87dbeed36c59,320304033483541803d7dc089e4cc61de0074e22..c7f1f2f0ac07b7d36694fe6bd7ce6dd1a7a88f6a
--- 1/Documentation/diff-options.txt
--- 2/Documentation/diff-options.txt
+++ b/Documentation/diff-options.txt
@@@ -36,9 -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 +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
@@@ -687,11 -690,6 +690,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.