From: Junio C Hamano <junkio@cox.net>
Date: Fri, 12 Aug 2005 05:12:29 +0000 (-0700)
Subject: Merge changes in the master branch into 0.99.5 preparation branch.
X-Git-Tag: v0.99.5~24
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=8eb14dc1882ade6f881ae93dfd7ecaa0dc0f0fdc;p=git.git

Merge changes in the master branch into 0.99.5 preparation branch.
---

8eb14dc1882ade6f881ae93dfd7ecaa0dc0f0fdc
diff --cc debian/changelog
index dd86f82d8,85d4d0094..28cfb0f84
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,11 +1,17 @@@
 +git-core (0.99.5-0) unstable; urgency=low
 +
 +  * GIT 0.99.5
 +
 + -- Junio C Hamano <junkio@cox.net>  Wed, 10 Aug 2005 22:05:00 -0700
 +
+ git-core (0.99.4-3) unstable; urgency=low
+ 
+   * Split off gitk.
+   * Do not depend on diff which is an essential package.
+   * Use dh_movefiles, not dh_install, to stage two subpackages.
+ 
+  -- Matthias Urlichs <smurf@debian.org>  Thu, 11 Aug 2005 01:43:24 +0200
+ 
  git-core (0.99.4-2) unstable; urgency=low
  
    * Git 0.99.4 official release.