Merge branch 'master' into layer/cosmetics

2025-11-23 11:41:18 -05:00 · 2019-04-19 21:36:00 +02:00
parent 8b9e08f704 3a33910b94
commit c1de47b2e7
15 changed files with 17 additions and 19 deletions
--- a/.gitmodules
+++ b/.gitmodules
@@ -42,17 +42,15 @@
 [submodule "hl-todo"]
 	path = lib/hl-todo
 	url = git@github.com:tarsius/hl-todo.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
 	recursive-byte-compile = true
 	info-path = Documentation
-[submodule "magit-popup"]
-	path = lib/magit-popup
-	url = git@github.com:magit/magit-popup.git
 [submodule "mode-line-debug"]
 	path = lib/mode-line-debug
 	url = git@github.com:tarsius/mode-line-debug.git
@@ -74,6 +72,7 @@
 [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
--- a/init.el
+++ b/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
--- 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