[PATCH] Fix assertion failure when merging common ancestors.

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

diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
index 58b9c46..48cf93c 100644 (file)
--- a/Documentation/diff-options.txt
+++ b/Documentation/diff-options.txt
@@ -5,9 +5,9 @@
        Synonym for "-p".
 
 -r::
-       Look recursivelly in subdirectories; this flag does not
+       Look recursively in subdirectories; this flag does not
        mean anything to commands other than "git-diff-tree";
-       other commands always looks at all the subdirectories.
+       other diff commands always look at all the subdirectories.
 
 -z::
        \0 line termination on output
@@ -51,3 +51,5 @@
        Swap two inputs; that is, show differences from cache or
        on-disk file to tree contents.
 
+For more detailed explanation on these common options, see also
+link:diffcore.html[diffcore documentation].