mirror/emacs.g
1
0
Fork 0
mirror of https://github.com/emacscollective/emacs.g.git synced 2025-07-26 11:24:25 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Jonas Bernoulli 2024-08-24 20:19:41 +02:00
commit 00595c41be
No known key found for this signature in database
GPG Key ID: 230C2EFBB326D927
10 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
.gitmodules vendored
View File

@ -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
View File

@ -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)
;;

2
lib/forge

@ -1 +1 @@
Subproject commit ec68fcd778f6b3dc6100498aea790457d2fc98f6
Subproject commit 30f181f785522f2debf60945d6b589a65bc415f6

2
lib/ghub

@ -1 +1 @@
Subproject commit 0fd648f0529f34b5da441d54c9dbff7810477d12
Subproject commit 1a80f68019686f73b0f4f309636c7acb7578d80e

2
lib/magit-imerge

@ -1 +1 @@
Subproject commit b7cfe49a197c2cf5948109921e053711b156389d
Subproject commit e9955c3b4dac2661f67d9882ed3367471e529cfc

2
lib/magit-tbdiff

@ -1 +1 @@
Subproject commit ff416b87a77a2f7cea234d9063ff629fc0e4c6c8
Subproject commit 03cb872f00dd7fc868de0c8d7661803b5d011aa0

2
lib/markdown-mode

@ -1 +1 @@
Subproject commit b7da085037cd052ac61dbdf4b1ae097ec31ccaf0
Subproject commit 6d1f08b3c52ccf9129ffa069fd0bfccc66cf72d5

2
lib/orgit

@ -1 +1 @@
Subproject commit 4a585029875a1dbbe96d8ac157bd2fd02875f289
Subproject commit 59d21fdb21f84238c3172d37fdd2446b753e98dc

2
lib/orgit-forge

@ -1 +1 @@
Subproject commit 6f424ff3a2df7d9c00c217011949c1367cc15227
Subproject commit 2718a6aaf0f64cb52c64c419053fbc80eb358c8d

2
lib/yaml

@ -1 +1 @@
Subproject commit a19fbf948a945571300e5a20ff1dbfa6ecfa0d16
Subproject commit 70c4fcead97e9bd6594e418c922ae769818f4245