From: Nicolas Petton <nicolas@petton.fr>
Date: Thu, 5 Oct 2017 20:23:49 +0000 (+0200)
Subject: ; * Makefile.in: set PREFERRED_BRANCH to emacs-26
X-Git-Tag: emacs-26.0.90~45^2~21
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=82d2a05a74c120480dc1b68243430c9417bfc523;p=emacs.git

; * Makefile.in: set PREFERRED_BRANCH to emacs-26
---

diff --git a/Makefile.in b/Makefile.in
index b882da19287..8ad3f99a249 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: