From f3778d700f109e4bc67a3f7088b9d41cc8f4b2db Mon Sep 17 00:00:00 2001 From: Jonas Bernoulli Date: Mon, 27 Nov 2017 11:56:33 +0100 Subject: [PATCH] Assimilate magit-popup v2.12.0-2-g70e3cdd Update magit to 2.11.0-286-gaa0f18646 magit-popup is no longer part of the magit repository. --- .gitmodules | 3 +++ lib/magit | 2 +- lib/magit-popup | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) create mode 160000 lib/magit-popup diff --git a/.gitmodules b/.gitmodules index 40f4d77..69e95e4 100644 --- a/.gitmodules +++ b/.gitmodules @@ -34,6 +34,9 @@ path = lib/magit url = git@github.com:magit/magit.git 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 diff --git a/lib/magit b/lib/magit index 4ad2ebf..aa0f186 160000 --- a/lib/magit +++ b/lib/magit @@ -1 +1 @@ -Subproject commit 4ad2ebfef0afa7e5f5fb85e8d1146da613804fe5 +Subproject commit aa0f186467711534ec538e5bf9ea5fdbad0cfc1f diff --git a/lib/magit-popup b/lib/magit-popup new file mode 160000 index 0000000..70e3cdd --- /dev/null +++ b/lib/magit-popup @@ -0,0 +1 @@ +Subproject commit 70e3cdd6140ebdf477f86b88ac2bd1a8de115e88