From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 22 Mar 2018 21:24:21 +0000 (-0700)
Subject: Merge branch 'bp/fsmonitor' into maint
X-Git-Tag: v2.16.3~8
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/5a03f1d75ad6d373cdd0b76e379962e04cdaaa61?ds=inline;hp=-c

Merge branch 'bp/fsmonitor' into maint

Doc update for a recently added feature.

* bp/fsmonitor:
fsmonitor: update documentation to remove reference to invalid config settings
---

5a03f1d75ad6d373cdd0b76e379962e04cdaaa61
diff --combined Documentation/git-update-index.txt
index bdb0342593,2fec666ee3..ad2383d7ed
--- a/Documentation/git-update-index.txt
+++ b/Documentation/git-update-index.txt
@@@ -161,7 -161,7 +161,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.
  
@@@ -484,8 -484,8 +484,8 @@@ the `core.fsmonitor` configuration vari
  linkgit:git-config[1]) than using the `--fsmonitor` option to
  `git update-index` in each repository, especially if you want to do so
  across all repositories you use, because you can set the configuration
- variable to `true` (or `false`) in your `$HOME/.gitconfig` just once
- and have it affect all repositories you touch.
+ variable in your `$HOME/.gitconfig` just once and have it affect all
+ repositories you touch.
  
  When the `core.fsmonitor` configuration variable is changed, the
  file system monitor is added to or removed from the index the next time