* Improve the RecentChanges display for git merges, by passing -c instead

[ikiwiki.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index 3817f142aabe4345c4da007de5a7ddc6e2818a64..8326de6ce8f3d127adedf535bef79e9fa0dd4e7d 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,8 +5,15 @@ ikiwiki (2.12) UNRELEASED; urgency=low
     page name to be expired and reused for several distinct guids. When this
     happened, the expiry code counted each past guid that had used that page
     name as a currently existing page, and thus expired too many pages.
+  * Avoid a race in the git rcs_commit function, by not assuming HEAD will
+    stay the same for the duration of the function.
+  * Avoid using commands like git-diff and instead use "git diff".
+    In some configurations, only the main git command is in the path.
+  * Improve the RecentChanges display for git merges, by passing -c instead
+    of -m to git-log, and by skipping display of commits that change no
+    pages.
 
- -- Joey Hess <joeyh@debian.org>  Tue, 30 Oct 2007 22:47:36 -0400
+ -- Joey Hess <joeyh@debian.org>  Wed, 31 Oct 2007 18:30:54 -0400
 
 ikiwiki (2.11) unstable; urgency=low