diff options
Diffstat (limited to 'emacs/.emacs.d/init/ycp-vc.el')
| -rw-r--r-- | emacs/.emacs.d/init/ycp-vc.el | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/emacs/.emacs.d/init/ycp-vc.el b/emacs/.emacs.d/init/ycp-vc.el index 49ef58e..d9de2ca 100644 --- a/emacs/.emacs.d/init/ycp-vc.el +++ b/emacs/.emacs.d/init/ycp-vc.el @@ -58,7 +58,8 @@ (my-package vc-git (:delay 30) (add-to-list 'safe-local-variable-values - '(vc-git-annotate-switches . "-w"))) + '(vc-git-annotate-switches . "-w")) + (setq vc-git-grep-template "git --no-pager grep -n <C> -A1 -B1 -e <R> -- <F>")) (my-package git-commit (:install t) @@ -72,6 +73,7 @@ (require 'magit-diff) (setq magit-diff-refine-hunk t) + (setq magit-diff-adjust-tab-width t) (require 'magit-repos) (my-setq-from-local magit-repository-directories) @@ -81,7 +83,9 @@ (my-package my-magit (:delay 30) (my-keybind global-map - "\C-xpM" #'my-project-magit-at)) + "C-x pM" #'my-project-magit-at + "C-x g" #'my-magit-status) +) (my-package magit-annex (:delay 60)) |