Merge branch 'jc/maint-1.7.4-pathspec-stdin-and-cmdline'

diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
index 7e4bd425e1fec23bbca0e89a0d7b4f53cf4f4483..c32105f1ed35f53a0922f32ad3fb271592d79d28 100644 (file)
--- a/Documentation/diff-options.txt
+++ b/Documentation/diff-options.txt
@@ -243,7 +243,7 @@ ifdef::git-log[]
        For following files across renames while traversing history, see
        `--follow`.
 endif::git-log[]
-       If `n` is specified, it is a is a threshold on the similarity
+       If `n` is specified, it is a threshold on the similarity
        index (i.e. amount of addition/deletions compared to the
        file's size). For example, `-M90%` means git should consider a
        delete/add pair to be a rename if more than 90% of the file