Merge branch 'bp/fsmonitor' into maint
authorJunio C Hamano <gitster@pobox.com>
Thu, 22 Mar 2018 21:24:21 +0000 (14:24 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 22 Mar 2018 21:24:21 +0000 (14:24 -0700)
commit5a03f1d75ad6d373cdd0b76e379962e04cdaaa61
treeb579a22b4f25e157a6e6753e4819c32b699d2493
parentdfc20a5e3c5f15e625044ef919c943bbc5a6aefc
parent4ccf461f56158b46e86731b0040e412e60b95a6e
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
Documentation/git-update-index.txt