doc/diff-options: fix out of place mentions of '--patch/-p'

First, references to --patch and -p appeared in the description of
git-format-patch, where the options themselves are not included.

Next, the description of --unified option elsewhere had duplicate implied
statements: "Implies --patch. Implies -p."

Signed-off-by: Sergey Organov <sorganov@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
index 573fb9bb71e2b7df1062258289a0af308c50bf5b..320304033483541803d7dc089e4cc61de0074e22 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