summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorStefano Lattarini <stefano.lattarini@gmail.com>2012-01-15 19:43:18 +0100
committerStefano Lattarini <stefano.lattarini@gmail.com>2012-01-17 09:18:58 +0100
commit6ed5195ee1b1d46b225d7e97d897b773e9aedf97 (patch)
tree7ac734f3712b21da0925d1df57aad1e2ac2823f5 /.gitignore
parent46c04f8009bd38f5ec07097a2f210f0d915b6169 (diff)
downloadautoconf-6ed5195ee1b1d46b225d7e97d897b773e9aedf97.tar.gz
maint: generate ChangeLog from git log
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.3: ... to this. * build-aux/gitlog-to-changelog: New script, synced from gnulib. * cfg.mk (gnulib-update): Also sync gitlog-to-changelog. * Makefile.am (gen-ChangeLog): New .PHONY rule, generate the ChangeLog for distribution. (dist-hook): Depend on it. ($(srcdir)/ChangeLog): New dummy rule, to pacify automake "gnu" strictness. Creates a dummy ChangeLog, that will be overridden by the proper one at distribution time. (gen_start_date): New variable, the date starting from which the git log entries are to be copied in the generated ChangeLog. (EXTRA_DIST): Add ChangeLog.3 and gitlog-to-changelog. * configure.ac (AC_CONFIG_SRCDIR): Use 'lib/autoconf/autoconf.m4' instead of 'ChangeLog' as the sentinel file. * .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 119a0ce8..b40b90ac 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,7 @@
.#*
.version
CVS
+/ChangeLog
/Fetchdir
/INSTALL
Makefile