mirror/emacs.g
1
0
Fork 0
mirror of https://github.com/emacscollective/emacs.g.git synced 2025-07-05 16:37:39 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Jonas Bernoulli 2018-01-29 11:17:15 +01:00
commit 937576cb82
9 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
init.el
View File

@ -91,6 +91,7 @@
:config (setq ediff-window-setup-function 'ediff-setup-windows-plain))
(use-package eldoc
:when (version< "25" emacs-version)
:config (global-eldoc-mode))
(use-package git-commit
@ -230,6 +231,7 @@
:config (savehist-mode))
(use-package saveplace
:when (version< "25" emacs-version)
:config (save-place-mode))
(use-package shell

2
lib/borg

@ -1 +1 @@
Subproject commit 454daf91e53e94292a59308c54b251fd83f99464
Subproject commit 593314b8f1f4542155eb4dae0ff1be375895b83d

2
lib/dash

@ -1 +1 @@
Subproject commit 138c22a96c35337a7ba5860e56dd4d5395685d92
Subproject commit c1991d4c22f356be21df6b3badd7233a94df7937

2
lib/diff-hl

@ -1 +1 @@
Subproject commit bec9889de7bf48d28826039880cec9bfad24a628
Subproject commit 9ef21e4ea2389545417741e20a89d92bfd72d6ff

2
lib/emacsql

@ -1 +1 @@
Subproject commit 616dde37524f47246bbb161f20d3f5f090f10fbf
Subproject commit 62d39157370219a1680265fa593f90ccd51457da

2
lib/ghub

@ -1 +1 @@
Subproject commit 895933408a8bf20623264ce9b6440999a3669f17
Subproject commit f1b647faf5ce5f033728236b9263e7ecee8f536f

2
lib/magit

@ -1 +1 @@
Subproject commit 73ea37afbb6d4eca7a67d0652a5e41e4a8d3b421
Subproject commit 4e637088f297639ac740fc8aa662610958ad38ce

2
lib/magit-popup

@ -1 +1 @@
Subproject commit 5a2a6f2907a09c7592c4631d2678dd7ab44fd5a2
Subproject commit ab75385a1fb8c0fba0769d448b13ba8324835261

2
lib/use-package

@ -1 +1 @@
Subproject commit 05a4033b830bf52c596ceedea10b2cbd91f85fdb
Subproject commit 8ecb0f1c56eaeb04213b476866eaa6939f735a61