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

Assimilate magit and dependencies

Browse Source 
Assimilate magit        2.6.2-68-g97972fb
Assimilate with-editor v2.5.1
This commit is contained in:
Jonas Bernoulli 2016-05-17 18:23:00 +02:00
parent b84f6d64c6
commit 3cbf0e2061
4 changed files with 30 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.gitmodules vendored
View File

@ -18,6 +18,13 @@
[submodule "finalize"]
path = lib/finalize
url = git@github.com:skeeto/elisp-finalize.git
[submodule "magit"]
path = lib/magit
url = git@github.com:magit/magit.git
info-path = Documentation
[submodule "use-package"]
path = lib/use-package
url = git@github.com:jwiegley/use-package.git
[submodule "with-editor"]
path = lib/with-editor
url = git@github.com:magit/with-editor.git

21
init.el
View File

@ -47,6 +47,27 @@
(use-package dash
:config (dash-enable-font-lock))
(use-package magit
:defer t
:bind (("C-x g" . magit-status)
("C-x M-g" . magit-dispatch-popup))
:config
(magit-add-section-hook 'magit-status-sections-hook
'magit-insert-modules-unpulled-from-upstream
'magit-insert-unpulled-from-upstream)
(magit-add-section-hook 'magit-status-sections-hook
'magit-insert-modules-unpulled-from-pushremote
'magit-insert-unpulled-from-upstream)
(magit-add-section-hook 'magit-status-sections-hook
'magit-insert-modules-unpushed-to-upstream
'magit-insert-unpulled-from-upstream)
(magit-add-section-hook 'magit-status-sections-hook
'magit-insert-modules-unpushed-to-pushremote
'magit-insert-unpulled-from-upstream)
(magit-add-section-hook 'magit-status-sections-hook
'magit-insert-submodules
'magit-insert-unpulled-from-upstream))
(progn ; startup
(message "Loading %s...done (%.3fs)" user-init-file
(float-time (time-subtract (current-time)

1
lib/magit Submodule

@ -0,0 +1 @@
Subproject commit 97972fb58b0b73696e94454fffeb2058561d7215

1
lib/with-editor Submodule

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