diff options
Diffstat (limited to '.emacs.d/init.el')
| -rw-r--r-- | .emacs.d/init.el | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/.emacs.d/init.el b/.emacs.d/init.el index 26d0a0f..e316de7 100644 --- a/.emacs.d/init.el +++ b/.emacs.d/init.el @@ -559,15 +559,19 @@ For disabling the behaviour for certain buffers and/or modes." ;; *the* right way to do git (use-package magit :defer 0.5 - :bind (("C-x g g" . magit-status) - ("C-x g s" . magit-status) - ("C-x g b" . magit-blame-addition) - ("C-x g l" . magit-log-buffer-file)) + :bind (("C-c g g" . magit-status) + ("C-c g s" . magit-status) + ("C-c g b" . magit-blame-addition) + ("C-c g l" . magit-log-buffer-file)) :config (magit-add-section-hook 'magit-status-sections-hook 'magit-insert-modules 'magit-insert-stashes 'append) + (magit-add-section-hook 'magit-status-sections-hook + 'magit-insert-ignored-files + 'magit-insert-untracked-files + 'append) (setq magit-repository-directories '(("~/" . 0) ("~/src/git/" . 1))) (nconc magit-section-initial-visibility-alist @@ -1258,6 +1262,7 @@ This function is intended for use with `ivy-ignore-buffers'." "C-c e" "eval" "C-c f" "files" "C-c F" "frames" + "C-c g" "magit" "C-S-h" "help(ful)" "C-c m" "multiple-cursors" "C-c P" "projectile" @@ -1267,7 +1272,7 @@ This function is intended for use with `ivy-ignore-buffers'." "C-c q" "boxquote" "C-c t" "themes" ;; "s-O" "outline" - "C-x g" "magit") + ) ;; prefixes for major modes (which-key-add-major-mode-key-based-replacements 'message-mode |