Merge branch 'master'

diff --combined Makefile
index 819c48ce8b4b6ae8389f401749d4fe0e34eaad9a,d8bb375752c24e86d6334e8f6a6c0c0e28df5038..2d8853d69e72f28410023cc1773288354a02a31f
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -50,7 -50,7 +50,7 @@@
  # Define USE_STDEV below if you want git to care about the underlying device
  # change being considered an inode change from the update-cache perspective.
  
 -GIT_VERSION = 0.99.9.GIT
 +GIT_VERSION = 0.99.9j
  
  # CFLAGS and LDFLAGS are for the users to override from the command line.
  
@@@ -208,6 -208,10 +208,10 @@@ endi
  ifeq ($(uname_O),Cygwin)
        NO_STRCASESTR = YesPlease
        NEEDS_LIBICONV = YesPlease
+       # There are conflicting reports about this.
+       # On some boxes NO_MMAP is needed, and not so elsewhere.
+       # Try uncommenting this if you see things break -- YMMV.
+       # NO_MMAP = YesPlease
        NO_IPV6 = YesPlease
        X = .exe
        ALL_CFLAGS += -DUSE_SYMLINK_HEAD=0