X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Makefile;h=f862170b1f8297b397022764a5937ff4d466b87d;hb=87ac1390d9ac2ab5e495b543caee12221a773fb7;hp=d56970c569985c956d2ba6a373ac4b90e9cdd636;hpb=9e83266525aad5c6210b9a21be9b1c6996d5544f;p=git.git diff --git a/Makefile b/Makefile index d56970c56..f862170b1 100644 --- a/Makefile +++ b/Makefile @@ -170,8 +170,8 @@ SCRIPT_SH = \ git-lost-found.sh git-quiltimport.sh SCRIPT_PERL = \ + git-add--interactive.perl \ git-archimport.perl git-cvsimport.perl git-relink.perl \ - git-rerere.perl \ git-cvsserver.perl \ git-svnimport.perl git-cvsexportcommit.perl \ git-send-email.perl git-svn.perl @@ -287,7 +287,9 @@ BUILTIN_OBJS = \ builtin-prune-packed.o \ builtin-push.o \ builtin-read-tree.o \ + builtin-reflog.o \ builtin-repo-config.o \ + builtin-rerere.o \ builtin-rev-list.o \ builtin-rev-parse.o \ builtin-rm.o \ @@ -358,8 +360,8 @@ ifeq ($(uname_O),Cygwin) NO_FAST_WORKING_DIRECTORY = UnfortunatelyYes # 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 + # Try commenting this out if you suspect MMAP is more efficient + NO_MMAP = YesPlease NO_IPV6 = YesPlease X = .exe endif