From c437d7110b388a97ff6b67b2bc3138d05fbe3576 Mon Sep 17 00:00:00 2001 From: Michael Albinus Date: Fri, 18 Oct 2024 18:33:48 +0200 Subject: [PATCH] * admin/notes/git-workflow: Use emacs-30 in examples. --- admin/notes/git-workflow | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/admin/notes/git-workflow b/admin/notes/git-workflow index d873cac4269..8e7d597db17 100644 --- a/admin/notes/git-workflow +++ b/admin/notes/git-workflow @@ -16,14 +16,14 @@ Initial setup Then we want to clone the repository. We normally want to have both the current master and (if there is one) the active release branch -(eg emacs-29). +(eg emacs-30). mkdir ~/emacs cd ~/emacs git clone @git.sv.gnu.org:/srv/git/emacs.git master cd master git config push.default current -git worktree add ../emacs-29 emacs-29 +git worktree add ../emacs-30 emacs-30 You now have both branches conveniently accessible, and you can do "git pull" in them once in a while to keep updated. @@ -67,7 +67,7 @@ which will look like commit 958b768a6534ae6e77a8547a56fc31b46b63710b -cd ~/emacs/emacs-29 +cd ~/emacs/emacs-30 git cherry-pick -xe 958b768a6534ae6e77a8547a56fc31b46b63710b and add "Backport:" to the commit string. Then @@ -109,7 +109,7 @@ up-to-date by doing a pull. Then start Emacs with emacs -l admin/gitmerge.el -f gitmerge You'll be asked for the branch to merge, which will default to -(eg) 'origin/emacs-29', which you should accept. Merging a local tracking +(eg) 'origin/emacs-30', which you should accept. Merging a local tracking branch is discouraged, since it might not be up-to-date, or worse, contain commits from you which are not yet pushed upstream.