Merge branch 'maint'

* maint:
Remove duplicated "is a"

diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
index 34f01458c296ce68bcba4c08177aba127fc2333b..23b605f9dba22c8c05f8b70abf952e981b57cd58 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