summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--build-aux/git-log-fix9
-rw-r--r--modules/gitlog-to-changelog1
3 files changed, 7 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog
index 51aba24ce4..428563538f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2014-04-18 Pádraig Brady <P@draigBrady.com>
+
+ gitlog-to-changelog: revert inclusion of git-log-fix file
+ * build-aux/git-log-fix: Delete dummy file.
+ * modules/gitlog-to-changelog: Don't reference (overwrite)
+ the project specific git-log-fix file.
+
2014-04-18 Assaf Gordon <agordon@wi.mit.edu>
maint.mk: Relax the copyright check to cater for non FSF projects
diff --git a/build-aux/git-log-fix b/build-aux/git-log-fix
deleted file mode 100644
index 10493751df..0000000000
--- a/build-aux/git-log-fix
+++ /dev/null
@@ -1,9 +0,0 @@
-# This file is expected to be used via gitlog-to-changelog's --amend=FILE
-# option. It specifies what changes to make to each given SHA1's commit
-# log and metadata, using Perl-eval'able expressions.
-
-# Here is an example, with leading "#" to comment it out:
-#
-#3a169f4c5d9159283548178668d2fae6fced3030
-## fix title:
-#s/all tile types/all file types/
diff --git a/modules/gitlog-to-changelog b/modules/gitlog-to-changelog
index 3897c3210f..4b403341ee 100644
--- a/modules/gitlog-to-changelog
+++ b/modules/gitlog-to-changelog
@@ -3,7 +3,6 @@ Convert git log to ChangeLog
Files:
build-aux/gitlog-to-changelog
-build-aux/git-log-fix
Depends-on: