masscollaborationlabs/emacs
2
0
Fork 0
mirror of https://github.com/masscollaborationlabs/emacs.git synced 2025-07-04 03:13:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

* admin/notes/git-workflow: Use emacs-30 in examples.

Browse source
This commit is contained in:
Michael Albinus 2024-10-18 18:33:48 +02:00
parent cf01f8776a
commit c437d7110b
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
admin/notes/git-workflow
View file

@ -16,14 +16,14 @@ Initial setup
Then we want to clone the repository. We normally want to have both 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 the current master and (if there is one) the active release branch
(eg emacs-29). (eg emacs-30).
mkdir ~/emacs mkdir ~/emacs
cd ~/emacs cd ~/emacs
git clone <membername>@git.sv.gnu.org:/srv/git/emacs.git master git clone <membername>@git.sv.gnu.org:/srv/git/emacs.git master
cd master cd master
git config push.default current 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 You now have both branches conveniently accessible, and you can do
"git pull" in them once in a while to keep updated. "git pull" in them once in a while to keep updated.
@ -67,7 +67,7 @@ which will look like
commit 958b768a6534ae6e77a8547a56fc31b46b63710b commit 958b768a6534ae6e77a8547a56fc31b46b63710b
cd ~/emacs/emacs-29 cd ~/emacs/emacs-30
git cherry-pick -xe 958b768a6534ae6e77a8547a56fc31b46b63710b git cherry-pick -xe 958b768a6534ae6e77a8547a56fc31b46b63710b
and add "Backport:" to the commit string. Then 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 emacs -l admin/gitmerge.el -f gitmerge
You'll be asked for the branch to merge, which will default to 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, branch is discouraged, since it might not be up-to-date, or worse,
contain commits from you which are not yet pushed upstream. contain commits from you which are not yet pushed upstream.