[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master e700fff: * admin/notes/git-workflow: Replace git-ne
From: |
Andreas Schwab |
Subject: |
[Emacs-diffs] master e700fff: * admin/notes/git-workflow: Replace git-new-workdir with git |
Date: |
Sun, 28 Jul 2019 11:45:33 -0400 (EDT) |
branch: master
commit e700fff256fc6c59dc8ab0063b7626486f312e0f
Author: Andreas Schwab <address@hidden>
Commit: Andreas Schwab <address@hidden>
* admin/notes/git-workflow: Replace git-new-workdir with git
worktree and remove draft marker.
---
admin/notes/git-workflow | 11 +++--------
1 file changed, 3 insertions(+), 8 deletions(-)
diff --git a/admin/notes/git-workflow b/admin/notes/git-workflow
index 5465786..28b6f91 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.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master e700fff: * admin/notes/git-workflow: Replace git-new-workdir with git,
Andreas Schwab <=