aboutsummaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-05-06 10:44:23 -0700
committerJunio C Hamano <gitster@pobox.com>2011-05-06 10:44:23 -0700
commitef6b43a44b5e25afe6eee32fcfda7d2a738cec3c (patch)
treea45c82ee3b94312ae201959cf0ffa59c554f335b /Documentation
parentbe0dca39e960d67511ca5a75887b903ccae7ccce (diff)
parent4c007ae8351a0a2beba57e2930ed21aed141e51e (diff)
downloadgit-ef6b43a44b5e25afe6eee32fcfda7d2a738cec3c.tar.gz
git-ef6b43a44b5e25afe6eee32fcfda7d2a738cec3c.tar.xz
Merge branch 'maint'
* maint: Remove duplicated "is a"
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/diff-options.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
index 34f01458c..23b605f9d 100644
--- 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