From: Junio C Hamano Date: Thu, 10 Nov 2005 05:09:43 +0000 (-0800) Subject: GIT 0.99.9g X-Git-Tag: v0.99.9g X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=bd67d7d845eb5ae929306dadd3dff41cf04ce004;p=git.git GIT 0.99.9g Another snapshot, as slow and steady marth towards 1.0 continues. Major changes include: - Jim Radford's RPM split. - Fredrik's recursive merge strategy is now default for two heads merge. - Yaacov's SVN importer updates. Signed-off-by: Junio C Hamano --- 23ea3e201cea0deea909569e08e950a9ec2345f7 diff --cc Makefile index bfdaf762a,b202be177..5bd3dedf4 --- a/Makefile +++ b/Makefile @@@ -50,7 -50,7 +50,7 @@@ # Define USE_STDEV below if you want git to care about the underlying device # change being considered an inode change from the update-cache perspective. - GIT_VERSION = 0.99.9f -GIT_VERSION = 0.99.9.GIT ++GIT_VERSION = 0.99.9g # CFLAGS is for the users to override from the command line. diff --cc debian/changelog index 03a0f796e,10f67b8a2..e556beb40 --- a/debian/changelog +++ b/debian/changelog @@@ -1,39 -1,3 +1,45 @@@ ++git-core (0.99.9g-0) unstable; urgency=low ++ ++ * GIT 0.99.9g ++ ++ -- Junio C Hamano Wed, 9 Nov 2005 21:01:55 -0800 ++ +git-core (0.99.9f-0) unstable; urgency=low + + * GIT 0.99.9f + + -- Junio C Hamano Tue, 8 Nov 2005 01:21:52 -0800 + +git-core (0.99.9e-0) unstable; urgency=low + + * GIT 0.99.9e + + -- Junio C Hamano Sun, 6 Nov 2005 18:37:18 -0800 + +git-core (0.99.9d-0) unstable; urgency=low + + * GIT 0.99.9d + + -- Junio C Hamano Sat, 5 Nov 2005 11:46:37 -0800 + +git-core (0.99.9c-0) unstable; urgency=low + + * GIT 0.99.9c + + -- Junio C Hamano Thu, 3 Nov 2005 15:44:54 -0800 + +git-core (0.99.9b-0) unstable; urgency=low + + * GIT 0.99.9b + + -- Junio C Hamano Tue, 1 Nov 2005 21:39:39 -0800 + +git-core (0.99.9a-0) unstable; urgency=low + + * GIT 0.99.9a + + -- Junio C Hamano Sun, 30 Oct 2005 15:03:32 -0800 + git-core (0.99.9.GIT-1) unstable; urgency=low * Do not scatter txt and html documentation into feature