merge-recursive: conflicting rename case.

[git.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index 3a98210..084e37a 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,27 @@
+git-core (1.0.GIT-0) unstable; urgency=low
+
+  * Post GIT 1.0 development track.
+
+ -- Junio C Hamano <junkio@cox.net>  Wed, 21 Dec 2005 22:28:33 -0800
+
+git-core (1.0.0.GIT-0) unstable; urgency=low
+
+  * Post GIT 1.0.0 development track.
+
+ -- Junio C Hamano <junkio@cox.net>  Wed, 21 Dec 2005 12:12:05 -0800
+
+git-core (1.0.0-0) unstable; urgency=low
+
+  * GIT 1.0.0
+
+ -- Junio C Hamano <junkio@cox.net>  Wed, 21 Dec 2005 00:01:00 -0800
+
+git-core (0.99.9n-0) unstable; urgency=low
+
+  * GIT 0.99.9n aka 1.0rc6
+
+ -- Junio C Hamano <junkio@cox.net>  Wed, 14 Dec 2005 17:27:08 -0800
+
 git-core (0.99.9m-0) unstable; urgency=low
 
   * GIT 0.99.9m aka 1.0rc5