[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master fbbf3610fd5: * admin/notes/git-workflow: Replace emacs-28 by emac
From: |
Michael Albinus |
Subject: |
master fbbf3610fd5: * admin/notes/git-workflow: Replace emacs-28 by emacs-29 branch. |
Date: |
Fri, 9 Dec 2022 10:15:08 -0500 (EST) |
branch: master
commit fbbf3610fd5b27873e13cfd7702d5b0bbb15c2f8
Author: Michael Albinus <michael.albinus@gmx.de>
Commit: Michael Albinus <michael.albinus@gmx.de>
* admin/notes/git-workflow: Replace emacs-28 by emacs-29 branch.
---
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 265a106bad5..d33f49a1aca 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-28).
+(eg emacs-29).
mkdir ~/emacs
cd ~/emacs
git clone <membername>@git.sv.gnu.org:/srv/git/emacs.git master
cd master
git config push.default current
-git worktree add ../emacs-28 emacs-28
+git worktree add ../emacs-29 emacs-29
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-28
+cd ~/emacs/emacs-29
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-28', which you should accept. Merging a local tracking
+(eg) 'origin/emacs-29', 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.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- master fbbf3610fd5: * admin/notes/git-workflow: Replace emacs-28 by emacs-29 branch.,
Michael Albinus <=