X-Git-Url: https://git.grml.org/?a=blobdiff_plain;f=debian%2Fchangelog;h=4c7a4991f0e848b75a60a9b2a21e752d14a8a48e;hb=9d9ba039e307d69f0198724f865ae2484cd7ba05;hp=5e38ec3070ede4566001d44d3be0cccd0728a95a;hpb=225b0ae392d4ef58bd6d71832121c8303d39a99a;p=grml-etc-core.git

diff --git a/debian/changelog b/debian/changelog
index 5e38ec3..4c7a499 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+grml-etc-core (0.3.53) unstable; urgency=low
+
+  * zshrc: Handle a state of git in vcs_info(), when a normal
+    rebase conflicts
+  * zshrc: Make vcs_info() detect $GIT_DIR/svn and set the name of the
+    vcs to 'git-svn'
+
+ -- Frank Terbeck <ft@grml.org>  Wed, 27 Aug 2008 22:35:09 +0200
+
 grml-etc-core (0.3.52) unstable; urgency=low
 
   * zshrc: Add version control information to our prompt.