X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/78029cd561557cb28cc66856afd7cc7b96ea3470..fee2ed87aa5f0c2a1cefbe4056300e8a28794e39:/ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 48d80a9b..5727a03c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-07-31  Paolo Bonzini  <bonzini@gnu.org>
+
+	Support usage of git-merge-changelog.
+	* .gitattributes: New.
+	* HACKING: Document usage of git-merge-changelog.
+	* bootstrap: Install git-merge-changelog entries in .git/config
+	if appropriate.
+
 2008-07-27  Joel E. Denny  <jdenny@ces.clemson.edu>
 
 	Remove remaining dependence on CVS Id keyword.