Merge refs/heads/master from .

diff --git a/Makefile b/Makefile
index 007d42b0383f3c8dbc9dba703260b9d1e785fac7..f13ff5aa29ef9ade4d9652c970b79053b47d2d0d 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -32,7 +32,7 @@
 
 # DEFINES += -DUSE_STDEV
 
-GIT_VERSION = 0.99.5
+GIT_VERSION = 0.99.6
 
 CFLAGS = -g -O2 -Wall
 ALL_CFLAGS = $(CFLAGS) $(DEFINES)

diff --git a/debian/changelog b/debian/changelog
index 5b7b4d3ff3e3fb228588c320c52f07a8e0a0cd91..f3cf358fb111a4d7696f4fc117e43bb79e89c08e 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+git-core (0.99.6-0) unstable; urgency=low
+
+  * GIT 0.99.6
+
+ -- Junio C Hamano <junkio@cox.net>  Wed, 24 Aug 2005 23:09:35 -0700
+
 git-core (0.99.5-1) unstable; urgency=low
 
   * Enable git-send-email-script on Debian.  There is no reason to shy