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 2021-09-08 17:49:47 +02:00
commit d828863c25
10 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitmodules vendored
View File

@ -112,6 +112,9 @@
[submodule "with-editor"]
path = lib/with-editor
url = git@github.com:magit/with-editor.git
[submodule "yaml"]
path = lib/yaml
url = git@github.com:zkry/yaml.el.git
[submodule "yaml-mode"]
path = lib/yaml-mode
url = git@github.com:yoshiki/yaml-mode.git

16
init.el
View File

@ -149,15 +149,18 @@
(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))
;;
;; Margin settings
:init
(setq magit-log-margin '(nil age magit-log-margin-width nil 15))
(setq magit-refs-margin-for-tags t)
:config
(define-key magit-file-mode-map (kbd "C-c g") 'magit-file-dispatch)
;;
;; Disable safety nets
:config
(setq magit-commit-squash-confirm nil)
(setq magit-save-repository-buffers 'dontask)
(setf (nth 2 (assq 'magit-stash-pop magit-dwim-selection)) t)
@ -179,13 +182,10 @@
(add-to-list 'magit-repository-directories (cons "~/.emacs.d/" 0))
(add-to-list 'magit-repository-directories (cons "~/.emacs.d/lib/" 1))
;;
;; Commit settings
(setq magit-commit-extend-override-date nil)
(setq magit-commit-reword-override-date nil)
;;
;; Branch settings
(setq magit-branch-adjust-remote-upstream-alist
'(("master" "master" "next" "maint")))
'(("main" . ("main" "master" "next" "maint"))
("master" . ("main" "master" "next" "maint"))))
;;
;; Push settings
(setq magit-push-current-set-remote-if-missing 'default)

2
lib/forge

@ -1 +1 @@
Subproject commit b7ed932fdd40d7443fb13a1206d15cfa9f6f2b52
Subproject commit 9e7d6835b7eb3283eee84998de99af38cd9a2028

2
lib/ghub

@ -1 +1 @@
Subproject commit 5fae5e31586a11a2025168030e0eb3876502611c
Subproject commit 00a77b79c28e22db1b151c3f7857073ccbeff726

2
lib/libgit

@ -1 +1 @@
Subproject commit 0ef8b13aef011a98b7da756e4f1ce3bb18e4d55a
Subproject commit 77bd28aeaa2a49962e8f714741f5a69b656a2183

2
lib/magit-imerge

@ -1 +1 @@
Subproject commit f4b88f0c127faa154f138907bf4e98b1baf12fb6
Subproject commit cf3b4646aa0205e8d7f47e45165fe6403d6440f5

2
lib/magit-tbdiff

@ -1 +1 @@
Subproject commit e52e8ab4906996c410f6c6db890b9bfe0951d4ce
Subproject commit fef1b7772fe192c434089b67644ff93765e384d4

2
lib/markdown-mode

@ -1 +1 @@
Subproject commit 779a4c637719f5a192c128ed60ecffed3ff1760c
Subproject commit 4810cac10355310ec76cd0946d0af92d595b3b81

2
lib/orgit

@ -1 +1 @@
Subproject commit ac9b1a42863a864fde9d225890ef5464bffdc646
Subproject commit f956d802f19ea495efa95af6c673588afeb3adc5

1
lib/yaml Submodule

@ -0,0 +1 @@
Subproject commit 84b88c9ed178af16da18b230c1f61c57cefedf28