[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[nongnu] elpa-admin 4a3a7c2 193/439: * README: Improve subtree instructi
From: |
Philip Kaludercic |
Subject: |
[nongnu] elpa-admin 4a3a7c2 193/439: * README: Improve subtree instructions |
Date: |
Sun, 17 Oct 2021 15:48:00 -0400 (EDT) |
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.
- [nongnu] elpa-admin 27c180f 145/439: * README: Update for new "Version: 0" convention., (continued)
- [nongnu] elpa-admin 27c180f 145/439: * README: Update for new "Version: 0" convention., Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin 84f4eb7 153/439: * wcheck-mode: New package., Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin f08292f 152/439: * admin/archive-contents.el: Don't stop at the first incorrect version string., Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin faf7826 158/439: publish ada-mode 5.1.6, wisi 1.0.6, new package ada-ref-man, Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin 6ab28f9 156/439: drop Emacs dependency to 24.3, Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin 79849d3 167/439: Add 'packages/realgud/' from commit 'd811316e6a0f4eeee8a1347f504c196c86baa2cb', Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin 779c1d2 165/439: Add 'packages/loc-changes/' from commit '8447baff7cb4839ef8d1d747a14e5da85d0cee5b', Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin 345dc39 189/439: * GNUmakefile: Use LC_ALL rather than LANG, Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin d079afa 187/439: Squashed 'packages/pinentry/' changes from 075deb6..b3a45a5, Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin 97cad46 171/439: Merge commit '3fa56d7925d5b24c5cd11c61bd6b3235e753a055', Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin 4a3a7c2 193/439: * README: Improve subtree instructions,
Philip Kaludercic <=
- [nongnu] elpa-admin 2307841 196/439: * README: Expand instructions, Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin 842d54c 056/439: * admin/archive-contents.el (batch-make-site-dir, archive--write-pkg-file): New functions., Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin 3afe3ac 060/439: Use org-mode markup in README and rename it to README.org, Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin 49382d4 067/439: Some tweaks to README, Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin 49fce77 070/439: Rename README to README.rst, Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin 303f2c9 075/439: * admin/archive-contents.el (batch-make-site-package): New function., Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin febff3e 079/439: Make README more up-to-date, Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin 6ba7e63 077/439: Try to preserve timestamps. Fix ChangeLog generation., Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin bffc4a6 090/439: Don't create local branches, Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin 480283a 089/439: Move check_copyright to the makefile, Philip Kaludercic, 2021/10/17