[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs-26 82d2a05 2/3: ; * Makefile.in: set PREFERRED_BRANC
|
From: |
Nicolas Petton |
|
Subject: |
[Emacs-diffs] emacs-26 82d2a05 2/3: ; * Makefile.in: set PREFERRED_BRANCH to emacs-26 |
|
Date: |
Thu, 5 Oct 2017 17:18:50 -0400 (EDT) |
branch: emacs-26
commit 82d2a05a74c120480dc1b68243430c9417bfc523
Author: Nicolas Petton <address@hidden>
Commit: Nicolas Petton <address@hidden>
; * Makefile.in: set PREFERRED_BRANCH to emacs-26
---
Makefile.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile.in b/Makefile.in
index b882da1..8ad3f99 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1115,7 +1115,7 @@ ChangeLog:
./$(emacslog) -o $(CHANGELOG) -n $(CHANGELOG_HISTORY_INDEX_MAX)
# Check that we are in a good state for changing history.
-PREFERRED_BRANCH = master
+PREFERRED_BRANCH = emacs-26
preferred-branch-is-current:
git branch | grep -q '^\* $(PREFERRED_BRANCH)$$'
unchanged-history-files: