From: Junio C Hamano <junkio@cox.net>
Date: Thu, 15 Dec 2005 01:30:03 +0000 (-0800)
Subject: GIT 0.99.9n aka 1.0rc6
X-Git-Tag: v0.99.9n^0
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=1ed91937e5cd59fdbdfa5f15f6fac132d2b21ce0;hp=-c;p=git.git

GIT 0.99.9n aka 1.0rc6

Oh, I hate to do this but I ended up merging big usage string
cleanups from Fredrik, git-am enhancements that made a lot of
sense for non mbox users from HPA, and rebase changes (done
independently by me and Lukas) among other things, so git is
still in perpetual state of 1.0rc.  1.0 will probably be next
Wednesday, but who knows.

Signed-off-by: Junio C Hamano <junkio@cox.net>
---

1ed91937e5cd59fdbdfa5f15f6fac132d2b21ce0
diff --combined Makefile
index 8b433d12,d494ad4b..92cfee43
--- a/Makefile
+++ b/Makefile
@@@ -55,7 -55,7 +55,7 @@@ all
  # 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.9m
 -GIT_VERSION = 0.99.9.GIT
++GIT_VERSION = 0.99.9n
  
  # CFLAGS and LDFLAGS are for the users to override from the command line.
  
@@@ -449,7 -449,7 +449,7 @@@ test-delta$X: test-delta.c diff-delta.
  	$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $^
  
  check:
- 	for i in *.c; do sparse $(ALL_CFLAGS) $(SPARSE_FLAGS) $$i; done
+ 	for i in *.c; do sparse $(ALL_CFLAGS) $(SPARSE_FLAGS) $$i || exit; done
  
  
  
diff --combined debian/changelog
index 3a98210c,376f0fa5..d36904cd
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,81 -1,3 +1,87 @@@
++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
 +
 + -- Junio C Hamano <junkio@cox.net>  Sun, 11 Dec 2005 16:48:06 -0800
 +
 +git-core (0.99.9l-0) unstable; urgency=low
 +
 +  * GIT 0.99.9l aka 1.0rc4
 +
 + -- Junio C Hamano <junkio@cox.net>  Sat,  3 Dec 2005 23:45:23 -0800
 +
 +git-core (0.99.9k-0) unstable; urgency=low
 +
 +  * GIT 0.99.9k but not 1.0rc yet.
 +
 + -- Junio C Hamano <junkio@cox.net>  Fri, 25 Nov 2005 16:33:11 -0800
 +
 +git-core (0.99.9j-0) unstable; urgency=low
 +
 +  * GIT 0.99.9j aka 1.0rc3
 +
 + -- Junio C Hamano <junkio@cox.net>  Wed, 16 Nov 2005 20:39:55 -0800
 +
 +git-core (0.99.9i-0) unstable; urgency=low
 +
 +  * GIT 0.99.9i aka 1.0rc2
 +
 + -- Junio C Hamano <junkio@cox.net>  Mon, 14 Nov 2005 18:38:27 -0800
 +
 +git-core (0.99.9h-0) unstable; urgency=low
 +
 +  * GIT 0.99.9h
 +
 + -- Junio C Hamano <junkio@cox.net>  Fri, 11 Nov 2005 22:33:18 -0800
 +
 +git-core (0.99.9g-0) unstable; urgency=low
 +
 +  * GIT 0.99.9g
 +
 + -- Junio C Hamano <junkio@cox.net>  Wed,  9 Nov 2005 21:01:55 -0800
 +
 +git-core (0.99.9f-0) unstable; urgency=low
 +
 +  * GIT 0.99.9f
 +
 + -- Junio C Hamano <junkio@cox.net>  Tue,  8 Nov 2005 01:21:52 -0800
 +
 +git-core (0.99.9e-0) unstable; urgency=low
 +
 +  * GIT 0.99.9e
 +
 + -- Junio C Hamano <junkio@cox.net>  Sun,  6 Nov 2005 18:37:18 -0800
 +
 +git-core (0.99.9d-0) unstable; urgency=low
 +
 +  * GIT 0.99.9d
 +
 + -- Junio C Hamano <junkio@cox.net>  Sat,  5 Nov 2005 11:46:37 -0800
 +
 +git-core (0.99.9c-0) unstable; urgency=low
 +
 +  * GIT 0.99.9c
 +
 + -- Junio C Hamano <junkio@cox.net>  Thu,  3 Nov 2005 15:44:54 -0800
 +
 +git-core (0.99.9b-0) unstable; urgency=low
 +
 +  * GIT 0.99.9b
 +
 + -- Junio C Hamano <junkio@cox.net>  Tue,  1 Nov 2005 21:39:39 -0800
 +
 +git-core (0.99.9a-0) unstable; urgency=low
 +
 +  * GIT 0.99.9a
 +
 + -- Junio C Hamano <junkio@cox.net>  Sun, 30 Oct 2005 15:03:32 -0800
 +
  git-core (0.99.9.GIT-2) unstable; urgency=low
  
    * Build Dependency did not include libexpat-dev.