From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 6 May 2011 17:44:23 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.7.6-rc0~107
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/ef6b43a44b5e25afe6eee32fcfda7d2a738cec3c?ds=inline;hp=-c

Merge branch 'maint'

* maint:
Remove duplicated "is a"
---

ef6b43a44b5e25afe6eee32fcfda7d2a738cec3c
diff --combined Documentation/diff-options.txt
index 34f01458c2,c32105f1ed..23b605f9db
--- a/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