Use 'merge-base --all' where applicable.

diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
index 06500d04b7f56507cd8bc379cb34b91b7056bf18..32005b03f3bee40413d7ff0d33e143de85b194c6 100644 (file)
--- a/Documentation/diff-options.txt
+++ b/Documentation/diff-options.txt
@@ -4,10 +4,6 @@
 -u::
        Synonym for "-p".
 
--r::
-       Look recursively in subdirectories; only used by "git-diff-tree";
-       other diff commands always work recursively.
-
 -z::
        \0 line termination on output