[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] elpa-admin 4a3a7c2 193/357: * README: Improve subtree instruction
From: |
Stefan Monnier |
Subject: |
[elpa] elpa-admin 4a3a7c2 193/357: * README: Improve subtree instructions |
Date: |
Thu, 10 Dec 2020 18:06:41 -0500 (EST) |
branch: elpa-admin
commit 4a3a7c290ac63e0094062d55e0d271b32a314ce8
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] elpa-admin a5d74b0 291/357: * packages/yasnippet: Merge version 0.13.0 from upstream., (continued)
- [elpa] elpa-admin a5d74b0 291/357: * packages/yasnippet: Merge version 0.13.0 from upstream., Stefan Monnier, 2020/12/10
- [elpa] elpa-admin eb92dfc 293/357: Fix repo links for :core packages, Stefan Monnier, 2020/12/10
- [elpa] elpa-admin a71a25a 306/357: Update packages/darkroom from upstream, Stefan Monnier, 2020/12/10
- [elpa] elpa-admin f79d3e5 327/357: Merge commit 'b49ba259cc7e490e8acdecd28e66063f5ad1325e', Stefan Monnier, 2020/12/10
- [elpa] elpa-admin f9ce2f8 328/357: Merge commit 'b2c449c0d5aad67eeee9857e7fd7710f985084ec', Stefan Monnier, 2020/12/10
- [elpa] elpa-admin e48de90 332/357: * README: Fix typos., Stefan Monnier, 2020/12/10
- [elpa] elpa-admin 223f7eb 331/357: * README: Clarify deployment process., Stefan Monnier, 2020/12/10
- [elpa] elpa-admin d19a5b8 341/357: * README.org: New file, Stefan Monnier, 2020/12/10
- [elpa] elpa-admin b3e663b 353/357: Rename ELisp files, Stefan Monnier, 2020/12/10
- [elpa] elpa-admin 4ade74d 346/357: * README.org: Add license and an introduction., Stefan Monnier, 2020/12/10
- [elpa] elpa-admin 4a3a7c2 193/357: * README: Improve subtree instructions,
Stefan Monnier <=
- [elpa] elpa-admin 54886a6 199/357: Better generated HTML pages, Stefan Monnier, 2020/12/10
- [elpa] elpa-admin 5e9fdd4 197/357: * README: Revert change about package.el headers, Stefan Monnier, 2020/12/10
- [elpa] elpa-admin 3a394c3 188/357: Merge commit 'd76bcd7c0dcecb33e6955e25963028600c371588', Stefan Monnier, 2020/12/10
- [elpa] elpa-admin 7558d12 206/357: Make externals directory removal safer, Stefan Monnier, 2020/12/10
- [elpa] elpa-admin a8b876c 207/357: * admin/archive-contents.el: Make :core handling optional, Stefan Monnier, 2020/12/10
- [elpa] elpa-admin 3a129d5 190/357: Add support to build packages from Emacs repo, Stefan Monnier, 2020/12/10
- [elpa] elpa-admin 581dd5b 231/357: Fix a typo in the readme, Stefan Monnier, 2020/12/10
- [elpa] elpa-admin f79a619 218/357: * packages/gnome-c-style/gnome-c-tests.el: Add copyright blurb, Stefan Monnier, 2020/12/10
- [elpa] elpa-admin 28819e8 192/357: Skip uninteresting elements, Stefan Monnier, 2020/12/10
- [elpa] elpa-admin 345dc39 189/357: * GNUmakefile: Use LC_ALL rather than LANG, Stefan Monnier, 2020/12/10