diff --git a/README.md b/README.md index 3e14f85..dcde751 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ Assimilate Emacs packages as Git submodules About `borg.el` --------------- -[Borg][repo] is a bare-bones package manager for Emacs packages. It +[Borg] is a bare-bones package manager for Emacs packages. It provides only a few essential features and should be combined with other tools such as Magit, `epkg`, `use-package`, and `auto-compile`. @@ -32,30 +32,11 @@ update the drones you have assimilated yourself. If you do base your own configuration on this collective and make it publically available as source of inspiration for others, then please do so by forking the upstream repository, which is available from -[Github][gh-this], [Gitlab][gl-this], and [Bitbucket][bb-this]. +[Github]. You might also want to adjust this description. -Other collectives ------------------ - -It is also possible to create collectives that can be shared between -and worked on by many Emacs users, i.e. borg-based starter-kits. -Check out alternative collectives by browsing the repositories owned -by the `emacscollective` organisation/group/team, which is available -on [Github][gh-all], [Gitlab][gl-all], and [Bitbucket][bb-all]. - -Another alternative is the `bootstrap` collective. It assimilates a -single drone, `borg` itself, and is intended for users for whom even -the `emacs.g` collective is to opinionated. - [init]: https://emacsair.me/2016/05/17/assimilate-emacs-packages-as-git-submodules -[repo]: https://gitlab.com/tarsius/borg +[Borg]: https://gitlab.com/tarsius/borg [manual]: https://emacsmirror.net/manual/borg - -[gh-this]: https://github.com/emacscollective/emacs.g -[gl-this]: https://gitlab.com/emacscollective/emacs.g -[bb-this]: https://bitbucket.com/emacscollective/emacs.g -[gh-all]: https://github.com/emacscollective -[gl-all]: https://gitlab.com/emacscollective -[bb-all]: https://bitbucket.com/emacscollective +[Github]: https://github.com/emacscollective/emacs.g diff --git a/lib/auto-compile b/lib/auto-compile index 694b92e..8d11786 160000 --- a/lib/auto-compile +++ b/lib/auto-compile @@ -1 +1 @@ -Subproject commit 694b92ea58feb30a0104ccf2424fd921235ba517 +Subproject commit 8d117868a0a091389d528428136e60f951e9c550 diff --git a/lib/borg b/lib/borg index 8399ec8..362ae8a 160000 --- a/lib/borg +++ b/lib/borg @@ -1 +1 @@ -Subproject commit 8399ec8f10204df92d5192823bb9bdeae7a4e3bc +Subproject commit 362ae8aebc69aab81e04427d221717dd6bc1a81d diff --git a/lib/epkg b/lib/epkg index 71ce3ff..c8ab0e5 160000 --- a/lib/epkg +++ b/lib/epkg @@ -1 +1 @@ -Subproject commit 71ce3ffd41bdc90c649a044ddbee0b32b329c612 +Subproject commit c8ab0e5e1fda70113633ac6ee01c0aaecd8a1a99 diff --git a/lib/ghub b/lib/ghub index 1395d56..2962611 160000 --- a/lib/ghub +++ b/lib/ghub @@ -1 +1 @@ -Subproject commit 1395d56496c1581dda0c70a091500e2b947b8d35 +Subproject commit 2962611aad56a0f1586383b3e4ba6a65508a3991 diff --git a/lib/magit b/lib/magit index 260e4af..24ce908 160000 --- a/lib/magit +++ b/lib/magit @@ -1 +1 @@ -Subproject commit 260e4afe32da63c32188b6a0b8262d3e3a011a2a +Subproject commit 24ce90832ddff0db86581c1b7e947e83a13fe83e diff --git a/lib/magit-popup b/lib/magit-popup index 3f23e81..5a2a6f2 160000 --- a/lib/magit-popup +++ b/lib/magit-popup @@ -1 +1 @@ -Subproject commit 3f23e81eb0267d6578d8f1733c5e42699b0229a1 +Subproject commit 5a2a6f2907a09c7592c4631d2678dd7ab44fd5a2 diff --git a/lib/with-editor b/lib/with-editor index 05338d8..04d59d6 160000 --- a/lib/with-editor +++ b/lib/with-editor @@ -1 +1 @@ -Subproject commit 05338d893f3879391d7283324364b472e3f4f4d1 +Subproject commit 04d59d68dab58a7cf3034c84d8ba0553b78ae30c