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

[git.ikiwiki.info.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index 325a61de0108b7760d1b68b4f36cc6b300deabaf..8326de6ce8f3d127adedf535bef79e9fa0dd4e7d 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,8 +7,13 @@ ikiwiki (2.12) UNRELEASED; urgency=low
     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>  Wed, 31 Oct 2007 17:11:12 -0400
+ -- Joey Hess <joeyh@debian.org>  Wed, 31 Oct 2007 18:30:54 -0400
 
 ikiwiki (2.11) unstable; urgency=low