summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorStefano Lattarini <stefano.lattarini@gmail.com>2011-12-28 10:17:30 +0100
committerStefano Lattarini <stefano.lattarini@gmail.com>2011-12-28 10:29:59 +0100
commite6fa05e7c7df67117138bf131e1599b346213bd0 (patch)
treec5cb9f683a91e86fe4aa656dccef3ce01274c9af /.gitignore
parentf533e9d43dfe84f0e1706855bdd49579df5c4f5b (diff)
downloadautomake-e6fa05e7c7df67117138bf131e1599b346213bd0.tar.gz
maint: autogenerate ChangeLog
Following the practice set by various other GNU projects, we start to automatically generate the ChangeLog file from the git commit messages. This will avoid duplication (as the ChangeLog entries were always inserted both in the git commit message and in the version-controlled ChangeLog file), and potential problems with spurious merge conflicts (which, although greatly mitigated by Bruno Haible's `git-merge-changelog' helper program, have never been completely solved). * ChangeLog: Moved ... * ChangeLog.11:... to this. * Makefile.am (EXTRA_DIST): Add it. (gitlog_to_changelog_command, gitlog_to_changelog_options): New variables. (ChangeLog, am--changelog-regen-hook): New targets. * .gitignore: Add ChangeLog.
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 47823214e..33e3827fc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
Makefile.in
Makefile
+/ChangeLog
/aclocal.m4
/configure
/autom4te.cache