diff options
| author | Andreas Schwab | 2019-07-28 17:43:34 +0200 |
|---|---|---|
| committer | Andreas Schwab | 2019-07-28 17:44:19 +0200 |
| commit | e700fff256fc6c59dc8ab0063b7626486f312e0f (patch) | |
| tree | e87a27d354f78955128bc97bd40620d88dd805b0 /admin | |
| parent | 21827ac8c83ee3541eb0c25d72d3cdf1ee2a3489 (diff) | |
| download | emacs-e700fff256fc6c59dc8ab0063b7626486f312e0f.tar.gz emacs-e700fff256fc6c59dc8ab0063b7626486f312e0f.zip | |
* admin/notes/git-workflow: Replace git-new-workdir with git
worktree and remove draft marker.
Diffstat (limited to 'admin')
| -rw-r--r-- | admin/notes/git-workflow | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/admin/notes/git-workflow b/admin/notes/git-workflow index 54657866ef5..28b6f91a25d 100644 --- a/admin/notes/git-workflow +++ b/admin/notes/git-workflow | |||
| @@ -1,7 +1,3 @@ | |||
| 1 | (This is a draft. The method here won't actually work yet, because | ||
| 2 | neither git-new-workdir nor merge-changelog are in the Emacs | ||
| 3 | distribution yet.) | ||
| 4 | |||
| 5 | Setting up and using git for normal, simple bugfixing | 1 | Setting up and using git for normal, simple bugfixing |
| 6 | ===================================================== | 2 | ===================================================== |
| 7 | 3 | ||
| @@ -24,10 +20,9 @@ the current master and the emacs-26 branch. | |||
| 24 | mkdir ~/emacs | 20 | mkdir ~/emacs |
| 25 | cd ~/emacs | 21 | cd ~/emacs |
| 26 | git clone <membername>@git.sv.gnu.org:/srv/git/emacs.git master | 22 | git clone <membername>@git.sv.gnu.org:/srv/git/emacs.git master |
| 27 | (cd master; git config push.default current) | 23 | cd master |
| 28 | ./master/admin/git-new-workdir master emacs-26 | 24 | git config push.default current |
| 29 | cd emacs-26 | 25 | git worktree add ../emacs-26 emacs-26 |
| 30 | git checkout emacs-26 | ||
| 31 | 26 | ||
| 32 | You now have both branches conveniently accessible, and you can do | 27 | You now have both branches conveniently accessible, and you can do |
| 33 | "git pull" in them once in a while to keep updated. | 28 | "git pull" in them once in a while to keep updated. |