mirror/emacs.g
1
0
Fork 0
mirror of https://github.com/emacscollective/emacs.g.git synced 2025-11-23 11:41:18 -05: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
2019-12-08 00:50:24 +01:00
parent 8ea7f966df 1a4c3c0c9b
commit 99812e29e8
4 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
init.el
View File

@@ -154,9 +154,6 @@
:bind (("C-x g" . magit-status) :bind (("C-x g" . magit-status)
("C-x M-g" . magit-dispatch)) ("C-x M-g" . magit-dispatch))
:config :config
(setq magit-pull-or-fetch t)
(define-key magit-mode-map "f" 'magit-pull)
(define-key magit-mode-map "F" nil)
(define-key magit-file-mode-map (kbd "C-c g") 'magit-file-dispatch) (define-key magit-file-mode-map (kbd "C-c g") 'magit-file-dispatch)
;; ;;
;; Disable safety nets ;; Disable safety nets

2
lib/forge

Submodule lib/forge updated: 63cbf81f16...54f570dfa0

2
lib/magit-imerge

Submodule lib/magit-imerge updated: 54f2e25eb5...a7357ab87c

2
lib/orgit

Submodule lib/orgit updated: 1e578f8cf9...e7cddf39e3