diff options
| author | Nicolas Petton <nicolas@petton.fr> | 2017-10-05 22:23:49 +0200 |
|---|---|---|
| committer | Nicolas Petton <nicolas@petton.fr> | 2017-10-05 22:26:47 +0200 |
| commit | 82d2a05a74c120480dc1b68243430c9417bfc523 (patch) | |
| tree | 55df3b655a4eabfa0bc89dbb8ebf01818a08c0fa /Makefile.in | |
| parent | e933249f6bc82f0469792bd1fe1255dcaa813705 (diff) | |
| download | emacs-82d2a05a74c120480dc1b68243430c9417bfc523.tar.gz | |
; * Makefile.in: set PREFERRED_BRANCH to emacs-26
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 2 |
1 files changed, 1 insertions, 1 deletions
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: |