Merge branch 'bp/fsmonitor' into maint

diff --git a/Documentation/git-update-index.txt b/Documentation/git-update-index.txt
index 2fec666ee39f78e103f3ed67bd89315394f90399..ad2383d7ed2197ed517eab04eed6712440137fa2 100644 (file)
--- a/Documentation/git-update-index.txt
+++ b/Documentation/git-update-index.txt
@@ -161,7 +161,7 @@ you will need to handle the situation manually.
 +
 Version 4 performs a simple pathname compression that reduces index
 size by 30%-50% on large repositories, which results in faster load
-time. Version 4 is relatively young (first released in in 1.8.0 in
+time. Version 4 is relatively young (first released in 1.8.0 in
 October 2012). Other Git implementations such as JGit and libgit2
 may not support it yet.