procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* admin/notes/git-workflow: Replace git-new-workdir with git

Browse source 
worktree and remove draft marker.
This commit is contained in:
Andreas Schwab 2019-07-28 17:43:34 +02:00
parent 21827ac8c8
commit e700fff256
1 changed files with 3 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
admin/notes/git-workflow
View file

@ -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.