mirror of
https://github.com/emacscollective/emacs.g.git
synced 2025-11-23 11:41:18 -05:00
Merge branch 'layer/magit-directors-cut' into layer/all
This commit is contained in:
16
.gitmodules
vendored
16
.gitmodules
vendored
@@ -36,10 +36,10 @@
|
||||
url = https://github.com/emacscollective/epkg.git
|
||||
[submodule "forge"]
|
||||
path = lib/forge
|
||||
url = git@github.com:magit/forge.git
|
||||
url = https://github.com/magit/forge.git
|
||||
[submodule "ghub"]
|
||||
path = lib/ghub
|
||||
url = git@github.com:magit/ghub.git
|
||||
url = https://github.com/magit/ghub.git
|
||||
[submodule "git-modes"]
|
||||
path = lib/git-modes
|
||||
url = https://github.com/magit/git-modes.git
|
||||
@@ -57,13 +57,13 @@
|
||||
url = https://github.com/magit/magit.git
|
||||
[submodule "magit-imerge"]
|
||||
path = lib/magit-imerge
|
||||
url = git@github.com:magit/magit-imerge.git
|
||||
url = https://github.com/magit/magit-imerge.git
|
||||
[submodule "magit-tbdiff"]
|
||||
path = lib/magit-tbdiff
|
||||
url = git@github.com:magit/magit-tbdiff.git
|
||||
url = https://github.com/magit/magit-tbdiff.git
|
||||
[submodule "markdown-mode"]
|
||||
path = lib/markdown-mode
|
||||
url = git@github.com:jrblevin/markdown-mode.git
|
||||
url = https://github.com/jrblevin/markdown-mode.git
|
||||
[submodule "mode-line-debug"]
|
||||
path = lib/mode-line-debug
|
||||
url = git@github.com:tarsius/mode-line-debug.git
|
||||
@@ -75,10 +75,10 @@
|
||||
url = git@github.com:emacscollective/no-littering.git
|
||||
[submodule "orgit"]
|
||||
path = lib/orgit
|
||||
url = git@github.com:magit/orgit.git
|
||||
url = https://github.com/magit/orgit.git
|
||||
[submodule "orgit-forge"]
|
||||
path = lib/orgit-forge
|
||||
url = git@github.com:magit/orgit-forge.git
|
||||
url = https://github.com/magit/orgit-forge.git
|
||||
[submodule "orglink"]
|
||||
path = lib/orglink
|
||||
url = git@github.com:tarsius/orglink.git
|
||||
@@ -115,7 +115,7 @@
|
||||
url = https://github.com/magit/with-editor.git
|
||||
[submodule "yaml"]
|
||||
path = lib/yaml
|
||||
url = git@github.com:zkry/yaml.el.git
|
||||
url = https://github.com/zkry/yaml.el.git
|
||||
[submodule "yaml-mode"]
|
||||
path = lib/yaml-mode
|
||||
url = git@github.com:yoshiki/yaml-mode.git
|
||||
|
||||
5
init.el
5
init.el
@@ -159,13 +159,12 @@
|
||||
(use-package magit
|
||||
:defer t
|
||||
:commands (magit-add-section-hook)
|
||||
:init
|
||||
;;
|
||||
;; Key bindings
|
||||
:bind (("C-c g" . magit-dispatch)
|
||||
("C-c f" . magit-file-dispatch))
|
||||
(setq magit-define-global-key-bindings 'recommended)
|
||||
;;
|
||||
;; Margin settings
|
||||
:init
|
||||
(setq magit-log-margin '(nil age magit-log-margin-width nil 15))
|
||||
(setq magit-refs-margin-for-tags t)
|
||||
;;
|
||||
|
||||
Submodule lib/forge updated: ec68fcd778...30f181f785
2
lib/ghub
2
lib/ghub
Submodule lib/ghub updated: 0fd648f052...1a80f68019
Submodule lib/magit-imerge updated: b7cfe49a19...e9955c3b4d
Submodule lib/magit-tbdiff updated: ff416b87a7...03cb872f00
Submodule lib/markdown-mode updated: b7da085037...6d1f08b3c5
Submodule lib/orgit updated: 4a58502987...59d21fdb21
Submodule lib/orgit-forge updated: 6f424ff3a2...2718a6aaf0
2
lib/yaml
2
lib/yaml
Submodule lib/yaml updated: a19fbf948a...70c4fcead9
Reference in New Issue
Block a user