diff options
author | Andreas Schwab <schwab@linux-m68k.org> | 2019-07-28 17:43:34 +0200 |
---|---|---|
committer | Andreas Schwab <schwab@linux-m68k.org> | 2019-07-28 17:44:19 +0200 |
commit | e700fff256fc6c59dc8ab0063b7626486f312e0f (patch) | |
tree | e87a27d354f78955128bc97bd40620d88dd805b0 /admin | |
parent | 21827ac8c83ee3541eb0c25d72d3cdf1ee2a3489 (diff) | |
download | emacs-e700fff256fc6c59dc8ab0063b7626486f312e0f.tar.gz |
* 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 @@ -(This is a draft. The method here won't actually work yet, because -neither git-new-workdir nor merge-changelog are in the Emacs -distribution yet.) - Setting up and using git for normal, simple bugfixing ===================================================== @@ -24,10 +20,9 @@ the current master and the emacs-26 branch. mkdir ~/emacs cd ~/emacs git clone <membername>@git.sv.gnu.org:/srv/git/emacs.git master -(cd master; git config push.default current) -./master/admin/git-new-workdir master emacs-26 -cd emacs-26 -git checkout emacs-26 +cd master +git config push.default current +git worktree add ../emacs-26 emacs-26 You now have both branches conveniently accessible, and you can do "git pull" in them once in a while to keep updated. |