Merge branch 'master' into drone/bash-completion

This commit is contained in:
Jonas Bernoulli 2019-04-19 21:23:52 +02:00
commit f79dd7c898
15 changed files with 21 additions and 15 deletions

11
.gitmodules vendored
View File

@ -37,17 +37,22 @@
[submodule "graphql"]
path = lib/graphql
url = git@github.com:vermiculus/graphql.el.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 "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

View File

@ -98,7 +98,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

@ -1 +1 @@
Subproject commit bed783e7a85d5812cf1cb3f39c40ba718e015be6
Subproject commit e6bbb1371324c8884af3b201e9adbc9296eb2ff4

@ -1 +1 @@
Subproject commit 99d166796f181741ebd79542b96824b096bcb36c
Subproject commit a87d9a115ad0a1f3c2aa26300691e2a47e0e12b8

@ -1 +1 @@
Subproject commit 6514359b8606a6a9a94068ccd601fcd6379d6584
Subproject commit 15498602f42c19c1b8d7f8768f6b998dfd5b3a22

@ -1 +1 @@
Subproject commit 2cddce48d472111f178da84d44656f92012aa64b
Subproject commit 84a5fe1900af2e5cc522f02749804f0d9f094bbf

@ -1 +1 @@
Subproject commit f8c3d9fce28ab7d5b0c9fcf2c1236151ca7add24
Subproject commit 5ebd12b6ffaa9fbadefe8518eab07a028bbaf7c1

@ -1 +1 @@
Subproject commit d9e1dd216b4bbe86686b1656dbdccef508301f7d
Subproject commit 408d46a9d041b516e9fda0414058a287dfef37fb

@ -1 +1 @@
Subproject commit b04c7d9a3318316ef67a5d360582d990dc9f6098
Subproject commit c7ca6780bcd4d00d22e668e74b25f865ba892a45

1
lib/libgit Submodule

@ -0,0 +1 @@
Subproject commit e85e02ab3bfb6bf43c361bc4e78dd5b5ff93bccc

@ -1 +1 @@
Subproject commit 4e57537694e2758a4287973168e4f0d432ad1ae9
Subproject commit 68840e6da97fd35ac41c6f007c1c22dde62a7a6a

@ -1 +0,0 @@
Subproject commit 8eaa0becc2370484a432a8a19f40ce5e8d0f1642

1
lib/transient Submodule

@ -0,0 +1 @@
Subproject commit f2314ba2a4ac3412a8339707a3ca6d810ea66f6f

@ -1 +1 @@
Subproject commit 39a8b8812c2c9f6f0b299e6a04e504ef393694ce
Subproject commit 0ee88b5cac41acf974c4bedb8859931ead8bfc79

@ -1 +1 @@
Subproject commit 9dd9f176d96abc60365369de6d08c26c414ef1f3
Subproject commit 38df9bfc2227bcb7ac4899c83a03756d5f171450