[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 96b99c1: * Makefile.in (change-history-nocommit): N
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] master 96b99c1: * Makefile.in (change-history-nocommit): New. |
Date: |
Wed, 06 May 2015 21:02:11 +0000 |
branch: master
commit 96b99c1bef79f3839e1a2f3c8e8d6f5625dc5cc3
Author: Glenn Morris <address@hidden>
Commit: Glenn Morris <address@hidden>
* Makefile.in (change-history-nocommit): New.
---
Makefile.in | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/Makefile.in b/Makefile.in
index 858a34d..dc7e825 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1088,7 +1088,7 @@ bootstrap: bootstrap-clean
$(MAKE) MAKEFILE_NAME=force-Makefile force-Makefile
$(MAKE) all
-.PHONY: ChangeLog change-history change-history-commit
+.PHONY: ChangeLog change-history change-history-commit change-history-nocommit
.PHONY: master-branch-is-current no-ChangeLog unchanged-history-files
# The newest revision that should not appear in the generated ChangeLog.
@@ -1116,8 +1116,8 @@ unchanged-history-files:
# Copy newer commit messages to the start of the ChangeLog history file,
# and consider them to be older.
-change-history: no-ChangeLog master-branch-is-current unchanged-history-files \
- ChangeLog
+change-history-nocommit: no-ChangeLog master-branch-is-current \
+ unchanged-history-files ChangeLog
(sed '/^;; [L]ocal Variables:/,$$d' <ChangeLog && cat $(CHANGELOG_N)) \
>$(CHANGELOG_N).tmp
new_origin=$$(git log --pretty=format:%H HEAD^!) && \
@@ -1125,6 +1125,8 @@ change-history: no-ChangeLog master-branch-is-current
unchanged-history-files \
<Makefile.in >Makefile.in.tmp
mv $(CHANGELOG_N).tmp $(CHANGELOG_N)
mv Makefile.in.tmp Makefile.in
+
+change-history: change-history-nocommit
$(MAKE) address@hidden
# If 'make change-history' fails because the newest ChangeLog history
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master 96b99c1: * Makefile.in (change-history-nocommit): New.,
Glenn Morris <=