git-branch: -f to forcibly reset branch head.

diff --git a/Makefile b/Makefile
index ebff990b58afd1b38079e03ab570ca8899841f75..d8bb375752c24e86d6334e8f6a6c0c0e28df5038 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -208,6 +208,10 @@ endif
 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
@@ -466,7 +470,7 @@ deb: dist
 ### Cleaning rules
 
 clean:
-       rm -f *.o mozilla-sha1/*.o ppc/*.o compat/*.o $(PROGRAMS) $(LIB_FILE)
+       rm -f *.o mozilla-sha1/*.o arm/*.o ppc/*.o compat/*.o git $(PROGRAMS) $(LIB_FILE)
        rm -f $(filter-out gitk,$(SCRIPTS))
        rm -f *.spec *.pyc *.pyo
        rm -rf $(GIT_TARNAME)