Merge branch 'av/fsmonitor'
authorJunio C Hamano <gitster@pobox.com>
Tue, 21 Nov 2017 05:07:51 +0000 (14:07 +0900)
committerJunio C Hamano <gitster@pobox.com>
Tue, 21 Nov 2017 05:07:51 +0000 (14:07 +0900)
commitc9fdbca92c66b93f95a19bf1f38ab9088db78540
treeb0aaedc6f6c92d0de8a8fe49a19f8522653bcd96
parente05336bddacb90cf243aacc0f7b7f34f900453d7
parent1fff303fc2b31d5005f38f55f38c4e8521da5a93
Merge branch 'av/fsmonitor'

Various fixes to bp/fsmonitor topic.

* av/fsmonitor:
  fsmonitor: simplify determining the git worktree under Windows
  fsmonitor: store fsmonitor bitmap before splitting index
  fsmonitor: read from getcwd(), not the PWD environment variable
  fsmonitor: delay updating state until after split index is merged
  fsmonitor: document GIT_TRACE_FSMONITOR
  fsmonitor: don't bother pretty-printing JSON from watchman
  fsmonitor: set the PWD to the top of the working tree
Documentation/git.txt
cache.h
read-cache.c