aboutsummaryrefslogtreecommitdiffstats
path: root/admin/notes/git-workflow
diff options
context:
space:
mode:
authorMichael Albinus2022-12-09 16:14:56 +0100
committerMichael Albinus2022-12-09 16:14:56 +0100
commitfbbf3610fd5b27873e13cfd7702d5b0bbb15c2f8 (patch)
tree6515328ae1d409bfe99cb6bd16ef3599452a5e01 /admin/notes/git-workflow
parentcce37ac9f4c66d927d1acae75763e5fb56632783 (diff)
downloademacs-fbbf3610fd5b27873e13cfd7702d5b0bbb15c2f8.tar.gz
emacs-fbbf3610fd5b27873e13cfd7702d5b0bbb15c2f8.zip
* admin/notes/git-workflow: Replace emacs-28 by emacs-29 branch.
Diffstat (limited to 'admin/notes/git-workflow')
-rw-r--r--admin/notes/git-workflow8
1 files 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
16 16
17Then we want to clone the repository. We normally want to have both 17Then we want to clone the repository. We normally want to have both
18the current master and (if there is one) the active release branch 18the current master and (if there is one) the active release branch
19(eg emacs-28). 19(eg emacs-29).
20 20
21mkdir ~/emacs 21mkdir ~/emacs
22cd ~/emacs 22cd ~/emacs
23git clone <membername>@git.sv.gnu.org:/srv/git/emacs.git master 23git clone <membername>@git.sv.gnu.org:/srv/git/emacs.git master
24cd master 24cd master
25git config push.default current 25git config push.default current
26git worktree add ../emacs-28 emacs-28 26git worktree add ../emacs-29 emacs-29
27 27
28You now have both branches conveniently accessible, and you can do 28You now have both branches conveniently accessible, and you can do
29"git pull" in them once in a while to keep updated. 29"git pull" in them once in a while to keep updated.
@@ -67,7 +67,7 @@ which will look like
67 67
68commit 958b768a6534ae6e77a8547a56fc31b46b63710b 68commit 958b768a6534ae6e77a8547a56fc31b46b63710b
69 69
70cd ~/emacs/emacs-28 70cd ~/emacs/emacs-29
71git cherry-pick -xe 958b768a6534ae6e77a8547a56fc31b46b63710b 71git cherry-pick -xe 958b768a6534ae6e77a8547a56fc31b46b63710b
72 72
73and add "Backport:" to the commit string. Then 73and add "Backport:" to the commit string. Then
@@ -109,7 +109,7 @@ up-to-date by doing a pull. Then start Emacs with
109 emacs -l admin/gitmerge.el -f gitmerge 109 emacs -l admin/gitmerge.el -f gitmerge
110 110
111You'll be asked for the branch to merge, which will default to 111You'll be asked for the branch to merge, which will default to
112(eg) 'origin/emacs-28', which you should accept. Merging a local tracking 112(eg) 'origin/emacs-29', which you should accept. Merging a local tracking
113branch is discouraged, since it might not be up-to-date, or worse, 113branch is discouraged, since it might not be up-to-date, or worse,
114contain commits from you which are not yet pushed upstream. 114contain commits from you which are not yet pushed upstream.
115 115