Merge branch 'fixes'

diff --git a/.gitignore b/.gitignore
index 92deccb291e28e5ed714da404db4a95e5b14394f..938669fc09f5796c6a877aebbd6b5a229ff3c8a5 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -96,7 +96,8 @@ git-verify-pack
 git-verify-tag
 git-whatchanged
 git-write-tree
-#*.tar.gz
-#*.dsc
-#*.deb
-#git-core.spec
+git-core-*/?*
+*.tar.gz
+*.dsc
+*.deb
+git-core.spec

diff --git a/Makefile b/Makefile
index f83c4951bc0c7b71d17d3244f33a41bbde8c119e..e90f646af0a26449386b0b442bc8df844eca9820 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -44,7 +44,7 @@
 
 # DEFINES += -DUSE_STDEV
 
-GIT_VERSION = 0.99.7
+GIT_VERSION = 0.99.7c
 
 CFLAGS = -g -O2 -Wall
 ALL_CFLAGS = $(CFLAGS) $(PLATFORM_DEFINES) $(DEFINES)

diff --git a/debian/changelog b/debian/changelog
index 128513a455e8389e72520f00e96138a1ac26c042..ef6156a764126104760a9cb0e3824ef1848eb14f 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,21 @@
+git-core (0.99.7c-0) unstable; urgency=low
+
+  * GIT 0.99.7c
+
+ -- Junio C Hamano <junkio@cox.net>  Sat, 24 Sep 2005 11:33:36 -0700
+
+git-core (0.99.7b-0) unstable; urgency=low
+
+  * GIT 0.99.7b
+
+ -- Junio C Hamano <junkio@cox.net>  Thu, 22 Sep 2005 21:46:44 -0700
+
+git-core (0.99.7a-0) unstable; urgency=low
+
+  * GIT 0.99.7a
+
+ -- Junio C Hamano <junkio@cox.net>  Mon, 19 Sep 2005 19:29:07 -0700
+
 git-core (0.99.7-0) unstable; urgency=low
 
   * GIT 0.99.7