Merge branch 'ab/receive-pack-use-after-free-fix'

diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
index 554a34080d7081da917cd54cd34eceb7bf4cd95c..f37374165d19cdf626225764e54d8b4d85c05c65 100644 (file)
--- a/Documentation/diff-options.txt
+++ b/Documentation/diff-options.txt
@@ -36,7 +36,7 @@ endif::git-format-patch[]
 -U<n>::
 --unified=<n>::
        Generate diffs with <n> lines of context instead of
-       the usual three.
+       the usual three. Implies `--patch`.
 ifndef::git-format-patch[]
        Implies `-p`.
 endif::git-format-patch[]