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

This commit is contained in:
Jonas Bernoulli
2018-03-27 20:46:15 +02:00
7 changed files with 22 additions and 1 deletions

12
.gitmodules vendored
View File

@@ -1,6 +1,9 @@
[borg]
pushDefault = locutus
collective = emacsg
[submodule "apiwrap"]
path = lib/apiwrap
url = git@github.com:vermiculus/apiwrap.el.git
[submodule "auto-compile"]
path = lib/auto-compile
url = git@github.com:emacscollective/auto-compile.git
@@ -33,6 +36,9 @@
[submodule "ghub"]
path = lib/ghub
url = git@github.com:magit/ghub.git
[submodule "ghub+"]
path = lib/ghub+
url = git@github.com:vermiculus/ghub-plus.git
[submodule "git-modes"]
path = lib/git-modes
url = git@github.com:magit/git-modes.git
@@ -55,6 +61,9 @@
[submodule "magit-tbdiff"]
path = lib/magit-tbdiff
url = git@github.com:magit/magit-tbdiff.git
[submodule "magithub"]
path = lib/magithub
url = git@github.com:vermiculus/magithub.git
[submodule "markdown-mode"]
path = lib/markdown-mode
url = git@github.com:jrblevin/markdown-mode.git
@@ -88,6 +97,9 @@
[submodule "rainbow-mode"]
path = lib/rainbow-mode
url = git@github.com:emacsmirror/rainbow-mode.git
[submodule "s"]
path = lib/s
url = git@github.com:magnars/s.el.git
[submodule "undo-tree"]
path = lib/undo-tree
url = http://www.dr-qubit.org/git/undo-tree.git

View File

@@ -231,6 +231,11 @@
(setq magit-wip-after-apply-mode-lighter "")
(setq magit-wip-after-save-local-mode-lighter ""))
(use-package magithub
:after magit
:config
(magithub-feature-autoinject t))
(use-package man
:defer t
:config (setq Man-width 80))

1
lib/apiwrap Submodule

Submodule lib/apiwrap added at d80ae8d805

1
lib/ghub+ Submodule

Submodule lib/ghub+ added at ec821200e3

1
lib/magithub Submodule

Submodule lib/magithub added at 2dcadcceb1

1
lib/s Submodule

Submodule lib/s added at 5968b951bd