Merge changes in the master branch into 0.99.5 preparation branch.

diff --git a/Makefile b/Makefile
index e574f44faf4003664596fbef2ff7859b5e10865b..6bc3ed79775f12be1abffbd334127b8a9814b07e 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -32,7 +32,7 @@
 
 # DEFINES += -DUSE_STDEV
 
-GIT_VERSION=0.99.4
+GIT_VERSION=0.99.5
 
 COPTS?=-g -O2
 CFLAGS+=$(COPTS) -Wall $(DEFINES)
@@ -69,7 +69,8 @@ SCRIPTS=git git-apply-patch-script git-merge-one-file-script git-prune-script \
        git-request-pull-script git-bisect-script
 
 SCRIPTS += git-count-objects-script
-SCRIPTS += git-send-email-script
+# SCRIPTS += git-send-email-script
+SCRIPTS += git-revert-script
 
 PROG=   git-update-cache git-diff-files git-init-db git-write-tree \
        git-read-tree git-commit-tree git-cat-file git-fsck-cache \
@@ -243,7 +244,8 @@ deb: dist
 
 clean:
        rm -f *.o mozilla-sha1/*.o ppc/*.o $(PROG) $(LIB_FILE)
-       rm -f $(GIT_TARNAME).tar.gz git-core.spec git-core_$(GIT_VERSION)-*.deb
+       rm -f $(GIT_TARNAME).tar.gz git-core.spec
+       rm -f git-core_$(GIT_VERSION)-*.deb git-tk_$(GIT_VERSION)-*.deb
        rm -rf $(GIT_TARNAME)
        $(MAKE) -C tools/ clean
        $(MAKE) -C Documentation/ clean