mirror of
https://github.com/emacscollective/emacs.g.git
synced 2025-07-05 16:37:39 -04:00
Merge branch 'master' into drone/ivy
This commit is contained in:
commit
6d3791be93
11
.gitmodules
vendored
11
.gitmodules
vendored
@ -33,27 +33,26 @@
|
||||
[submodule "graphql"]
|
||||
path = lib/graphql
|
||||
url = git@github.com:vermiculus/graphql.el.git
|
||||
[submodule "hydra"]
|
||||
path = lib/hydra
|
||||
url = git@github.com:abo-abo/hydra.git
|
||||
[submodule "ivy"]
|
||||
path = lib/ivy
|
||||
url = git@github.com:abo-abo/swiper.git
|
||||
info-path = doc
|
||||
[submodule "libgit"]
|
||||
path = lib/libgit
|
||||
url = git@github.com:magit/libegit2.git
|
||||
build-step = make
|
||||
[submodule "magit"]
|
||||
path = lib/magit
|
||||
url = git@github.com:magit/magit.git
|
||||
recursive-byte-compile = true
|
||||
info-path = Documentation
|
||||
[submodule "magit-popup"]
|
||||
path = lib/magit-popup
|
||||
url = git@github.com:magit/magit-popup.git
|
||||
[submodule "packed"]
|
||||
path = lib/packed
|
||||
url = git@github.com:emacscollective/packed.git
|
||||
[submodule "transient"]
|
||||
path = lib/transient
|
||||
url = git@github.com:magit/transient.git
|
||||
info-path = docs
|
||||
[submodule "treepy"]
|
||||
path = lib/treepy
|
||||
url = git@github.com:volrath/treepy.el.git
|
||||
|
2
init.el
2
init.el
@ -111,7 +111,7 @@
|
||||
(use-package magit
|
||||
:defer t
|
||||
:bind (("C-x g" . magit-status)
|
||||
("C-x M-g" . magit-dispatch-popup))
|
||||
("C-x M-g" . magit-dispatch))
|
||||
:config
|
||||
(magit-add-section-hook 'magit-status-sections-hook
|
||||
'magit-insert-modules
|
||||
|
2
lib/borg
2
lib/borg
@ -1 +1 @@
|
||||
Subproject commit 4ffec24967ba805be2b2f1750e7cfffb85e26a1f
|
||||
Subproject commit a87d9a115ad0a1f3c2aa26300691e2a47e0e12b8
|
2
lib/dash
2
lib/dash
@ -1 +1 @@
|
||||
Subproject commit 26f065fd607cdf1a68e7987b9360accc2d0cbfb6
|
||||
Subproject commit 15498602f42c19c1b8d7f8768f6b998dfd5b3a22
|
@ -1 +1 @@
|
||||
Subproject commit 76289d24c61fac501d955a8419b5fdf7debddd5f
|
||||
Subproject commit 84a5fe1900af2e5cc522f02749804f0d9f094bbf
|
@ -1 +1 @@
|
||||
Subproject commit 59147c4cdfd18dc2736a6502a3283564ab5c1457
|
||||
Subproject commit 5ebd12b6ffaa9fbadefe8518eab07a028bbaf7c1
|
2
lib/epkg
2
lib/epkg
@ -1 +1 @@
|
||||
Subproject commit 4243b363d038b28650479b23949cb7dfd319542b
|
||||
Subproject commit 408d46a9d041b516e9fda0414058a287dfef37fb
|
2
lib/ghub
2
lib/ghub
@ -1 +1 @@
|
||||
Subproject commit 3566dc6e18d61455060a96deb70779c91f079c62
|
||||
Subproject commit c7ca6780bcd4d00d22e668e74b25f865ba892a45
|
@ -1 +0,0 @@
|
||||
Subproject commit 9c4a4711bc78364e114acbbcf484a60669d02d78
|
1
lib/libgit
Submodule
1
lib/libgit
Submodule
@ -0,0 +1 @@
|
||||
Subproject commit e85e02ab3bfb6bf43c361bc4e78dd5b5ff93bccc
|
@ -1 +1 @@
|
||||
Subproject commit 8b6c39999f0654601058bcae79b9fffe44696a09
|
||||
Subproject commit 68840e6da97fd35ac41c6f007c1c22dde62a7a6a
|
@ -1 +0,0 @@
|
||||
Subproject commit 8eaa0becc2370484a432a8a19f40ce5e8d0f1642
|
@ -1 +1 @@
|
||||
Subproject commit 0ad64ddc5db466fb3bcac67b931b30393cdbc0a5
|
||||
Subproject commit f2314ba2a4ac3412a8339707a3ca6d810ea66f6f
|
@ -1 +1 @@
|
||||
Subproject commit 12731665e068a68883bdb280e9844dbfd14e5626
|
||||
Subproject commit 0ee88b5cac41acf974c4bedb8859931ead8bfc79
|
@ -1 +1 @@
|
||||
Subproject commit 9dd9f176d96abc60365369de6d08c26c414ef1f3
|
||||
Subproject commit 38df9bfc2227bcb7ac4899c83a03756d5f171450
|
Loading…
x
Reference in New Issue
Block a user