Merge branch 'master' into layer/magit-directors-cut

2025-11-23 11:41:18 -05:00 · 2019-04-19 21:31:07 +02:00
parent 628321d3c8 3a33910b94
commit 27ff2715e0
14 changed files with 15 additions and 18 deletions
--- a/.gitmodules
+++ b/.gitmodules
@@ -37,9 +37,10 @@
 [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 "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
@@ -48,9 +49,6 @@
 [submodule "magit-imerge"]
 	path = lib/magit-imerge
 	url = git@github.com:magit/magit-imerge.git
-[submodule "magit-popup"]
-	path = lib/magit-popup
-	url = git@github.com:magit/magit-popup.git
 [submodule "magit-tbdiff"]
 	path = lib/magit-tbdiff
 	url = git@github.com:magit/magit-tbdiff.git
--- a/lib/borg
+++ b/lib/borg
--- a/lib/dash
+++ b/lib/dash
--- a/lib/diff-hl
+++ b/lib/diff-hl
--- a/lib/emacsql
+++ b/lib/emacsql
--- a/lib/epkg
+++ b/lib/epkg
--- a/lib/ghub
+++ b/lib/ghub
--- a/lib/hydra
+++ b/lib/hydra
--- a/lib/libgit
+++ b/lib/libgit
--- a/lib/magit
+++ b/lib/magit
--- a/lib/magit-popup
+++ b/lib/magit-popup
--- a/lib/transient
+++ b/lib/transient
--- a/lib/use-package
+++ b/lib/use-package
--- a/lib/with-editor
+++ b/lib/with-editor