[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] new-master d5f0e98 074/128: * README: Improve subtree instruction
From: |
Stefan Monnier |
Subject: |
[elpa] new-master d5f0e98 074/128: * README: Improve subtree instructions |
Date: |
Mon, 14 Dec 2020 15:39:34 -0500 (EST) |
branch: new-master
commit d5f0e98d95febf5f80774f6eca3136b77202356e
Author: Artur Malabarba <bruce.connor.am@gmail.com>
Commit: Artur Malabarba <bruce.connor.am@gmail.com>
* README: Improve subtree instructions
---
README | 22 ++++++++++++++++++++--
1 file changed, 20 insertions(+), 2 deletions(-)
diff --git a/README b/README
index a688040..ce7fd14 100644
--- a/README
+++ b/README
@@ -86,9 +86,27 @@ In both cases, a copy of the code is kept in the `elpa'
repository and
should be sync'd with the upstream every once in a while. This copy may
include local changes, tho ideally these should be kept to a minimum.
+*** Subtrees
+
In the `subtree' case, the copy of the code is kept here in the
-corresponding `packages/<pkg>' directory. You should be able to "git
-merge -s subtree" from the upstream branch.
+corresponding `packages/<pkg>' directory. You should be able to use:
+
+ git subtree add --prefix=packages/<pkg> <remote-repo> <remote-branch>
+
+to add your package from some remote repo, and then
+
+ git subtree pull --prefix=packages/<pkg> <remote-repo> <remote-branch>
+
+whenever you want to update it. On older git versions you can try "git
+merge -s subtree".
+
+When you're adding and pulling, DO NOT --SQUASH!!
+
+Don't worry about flooding elpa.git's commit log with your package's
+commit messages. Your package is part of elpa.git. Squashing
+doesn't help and only gets in the way.
+
+*** Externals
In the `external' case, the copy of the code is not kept here but in the
`externals/<pkg>' branch in the `elpa' repository.
- [elpa] new-master 0adfc0b 020/128: Note that 'autogen.sh' should be run to generate 'configure' and 'Makefile.in' (see #11), (continued)
- [elpa] new-master 0adfc0b 020/128: Note that 'autogen.sh' should be run to generate 'configure' and 'Makefile.in' (see #11), Stefan Monnier, 2020/12/14
- [elpa] new-master edf6202 023/128: Initial Import, Stefan Monnier, 2020/12/14
- [elpa] new-master 7a13deb 026/128: Remove the angle brackets, Stefan Monnier, 2020/12/14
- [elpa] new-master 5355d71 028/128: Add ENWC from bzr://bzr.savannah.nongnu.org/enwc/trunk, Stefan Monnier, 2020/12/14
- [elpa] new-master 2848e37 033/128: Add YAsnippet metadata., Stefan Monnier, 2020/12/14
- [elpa] new-master 72a45cb 040/128: more documentation and examples, Stefan Monnier, 2020/12/14
- [elpa] new-master 31e0ba5 046/128: supports web sockets, Stefan Monnier, 2020/12/14
- [elpa] new-master aa37293 058/128: README: Use remote.origin.url to avoid loosing write access and save some typing., Stefan Monnier, 2020/12/14
- [elpa] new-master ab1eca5 047/128: tutorials, Stefan Monnier, 2020/12/14
- [elpa] new-master ad82945 060/128: drop Emacs dependency to 24.3, Stefan Monnier, 2020/12/14
- [elpa] new-master d5f0e98 074/128: * README: Improve subtree instructions,
Stefan Monnier <=
- [elpa] new-master e04b2ae 079/128: Merge commit '00920450d83ffe7a02bbe98997e266726819efc2', Stefan Monnier, 2020/12/14
- [elpa] new-master 067b655 066/128: Add 'packages/test-simple/' from commit '75eea25bae04d8e5e3e835a2770f02f0ff4602c4', Stefan Monnier, 2020/12/14
- [elpa] new-master 3347928 093/128: Package pages improvements, Stefan Monnier, 2020/12/14
- [elpa] new-master b7842e2 090/128: Add 'packages/delight/' from commit 'cd037ed41ae29dda89e36ff2ac8637aea96acded', Stefan Monnier, 2020/12/14
- [elpa] new-master 69c5911 097/128: Add 'packages/hook-helpers/' from commit 'ff95f4944f3d6d1a43aca141cb7fa36a9043704d', Stefan Monnier, 2020/12/14
- [elpa] new-master 46a3b6d 106/128: * GNUmakefile (org-fetch): Use https and stick to wget, Stefan Monnier, 2020/12/14
- [elpa] new-master 6d8f052 112/128: More specific externals example., Stefan Monnier, 2020/12/14
- [elpa] new-master 2e9bb61 111/128: Update packages/darkroom from upstream, Stefan Monnier, 2020/12/14
- [elpa] new-master 4284ef8 051/128: README and install instructions mention GNU ELPA, Stefan Monnier, 2020/12/14
- [elpa] new-master 55f6ddc 057/128: Update README to tell how to checkout a single external package., Stefan Monnier, 2020/12/14