diff options
| author | Paul Eggert | 2021-10-13 11:14:59 -0700 |
|---|---|---|
| committer | Paul Eggert | 2021-10-13 11:18:55 -0700 |
| commit | 396d2d88afe254715eb3b09226e0353e72c47936 (patch) | |
| tree | e9fe4264f191208daffb38b47687b84fc1e5ab5c /admin/notes/git-workflow | |
| parent | 9e3b3ae9d94c6d521d771e08e1536a8e4875d720 (diff) | |
| download | emacs-396d2d88afe254715eb3b09226e0353e72c47936.tar.gz emacs-396d2d88afe254715eb3b09226e0353e72c47936.zip | |
Change release branch to emacs-28
* admin/notes/git-workflow:
* Makefile.in (PREFERRED_BRANCH): emacs-27 → emacs-28
Diffstat (limited to 'admin/notes/git-workflow')
| -rw-r--r-- | admin/notes/git-workflow | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/admin/notes/git-workflow b/admin/notes/git-workflow index d109cdaa354..265a106bad5 100644 --- a/admin/notes/git-workflow +++ b/admin/notes/git-workflow | |||
| @@ -16,14 +16,14 @@ Initial setup | |||
| 16 | 16 | ||
| 17 | Then we want to clone the repository. We normally want to have both | 17 | Then we want to clone the repository. We normally want to have both |
| 18 | the current master and (if there is one) the active release branch | 18 | the current master and (if there is one) the active release branch |
| 19 | (eg emacs-27). | 19 | (eg emacs-28). |
| 20 | 20 | ||
| 21 | mkdir ~/emacs | 21 | mkdir ~/emacs |
| 22 | cd ~/emacs | 22 | cd ~/emacs |
| 23 | git clone <membername>@git.sv.gnu.org:/srv/git/emacs.git master | 23 | git clone <membername>@git.sv.gnu.org:/srv/git/emacs.git master |
| 24 | cd master | 24 | cd master |
| 25 | git config push.default current | 25 | git config push.default current |
| 26 | git worktree add ../emacs-27 emacs-27 | 26 | git worktree add ../emacs-28 emacs-28 |
| 27 | 27 | ||
| 28 | You now have both branches conveniently accessible, and you can do | 28 | You 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 | ||
| 68 | commit 958b768a6534ae6e77a8547a56fc31b46b63710b | 68 | commit 958b768a6534ae6e77a8547a56fc31b46b63710b |
| 69 | 69 | ||
| 70 | cd ~/emacs/emacs-27 | 70 | cd ~/emacs/emacs-28 |
| 71 | git cherry-pick -xe 958b768a6534ae6e77a8547a56fc31b46b63710b | 71 | git cherry-pick -xe 958b768a6534ae6e77a8547a56fc31b46b63710b |
| 72 | 72 | ||
| 73 | and add "Backport:" to the commit string. Then | 73 | and 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 | ||
| 111 | You'll be asked for the branch to merge, which will default to | 111 | You'll be asked for the branch to merge, which will default to |
| 112 | (eg) 'origin/emacs-27', which you should accept. Merging a local tracking | 112 | (eg) 'origin/emacs-28', which you should accept. Merging a local tracking |
| 113 | branch is discouraged, since it might not be up-to-date, or worse, | 113 | branch is discouraged, since it might not be up-to-date, or worse, |
| 114 | contain commits from you which are not yet pushed upstream. | 114 | contain commits from you which are not yet pushed upstream. |
| 115 | 115 | ||