document and support usage of git-merge-changelog

[bison.git] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 48d80a9bc9a8a6bc8efa67978cd482c1b78fd682..5727a03c42fd68b2a10ab0e21841b7686fcb9717 100644 (file)
--- 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.