Merge branch 'master' into layer/cosmetics

.gitmodules

@@ -42,17 +42,15 @@
 [submodule "hl-todo"]
 	path = lib/hl-todo
 	url = git@github.com:tarsius/hl-todo.git
-[submodule "hydra"]
+[submodule "libgit"]
-	path = lib/hydra
+	path = lib/libgit
-	url = git@github.com:abo-abo/hydra.git
+	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

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