From: Junio C Hamano Date: Tue, 19 Sep 2017 03:52:26 +0000 (+0900) Subject: Merge branch 'ez/doc-duplicated-words-fix' into next X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/20781bd86651bf71dd872e85711d1a788dc1a827?hp=-c Merge branch 'ez/doc-duplicated-words-fix' into next Typofix. * ez/doc-duplicated-words-fix: doc: fix minor typos (extra/duplicated words) --- 20781bd86651bf71dd872e85711d1a788dc1a827 diff --combined Documentation/git-update-index.txt index e19eba62cd,a14e6aebd9..75c7dd9dea --- a/Documentation/git-update-index.txt +++ b/Documentation/git-update-index.txt @@@ -153,7 -153,7 +153,7 @@@ you will need to handle the situation m + 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. @@@ -214,7 -214,7 +214,7 @@@ will remove the intended effect of the Using --refresh --------------- `--refresh` does not calculate a new sha1 file or bring the index -up-to-date for mode/content changes. But what it *does* do is to +up to date for mode/content changes. But what it *does* do is to "re-match" the stat information of a file with the index, so that you can refresh the index for a file that hasn't been changed but where the stat entry is out of date.