Merge branch 'maint'

* maint:
Remove duplicated "is a"

diff --combined Documentation/diff-options.txt
index 34f01458c296ce68bcba4c08177aba127fc2333b,c32105f1ed35f53a0922f32ad3fb271592d79d28..23b605f9dba22c8c05f8b70abf952e981b57cd58
--- 1/Documentation/diff-options.txt
--- 2/Documentation/diff-options.txt
+++ b/Documentation/diff-options.txt
@@@ -243,7 -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
@@@ -263,19 -263,6 +263,19 @@@
        projects, so use it with caution.  Giving more than one
        `-C` option has the same effect.
  
 +-D::
 +--irreversible-delete::
 +      Omit the preimage for deletes, i.e. print only the header but not
 +      the diff between the preimage and `/dev/null`. The resulting patch
 +      is not meant to be applied with `patch` nor `git apply`; this is
 +      solely for people who want to just concentrate on reviewing the
 +      text after the change. In addition, the output obviously lack
 +      enough information to apply such a patch in reverse, even manually,
 +      hence the name of the option.
 ++
 +When used together with `-B`, omit also the preimage in the deletion part
 +of a delete/create pair.
 +
  -l<num>::
        The `-M` and `-C` options require O(n^2) processing time where n
        is the number of potential rename/copy targets.  This