diff options
Diffstat (limited to 'tag-emacs/emacs.d/init.org')
| -rw-r--r-- | tag-emacs/emacs.d/init.org | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/tag-emacs/emacs.d/init.org b/tag-emacs/emacs.d/init.org index 352f6ef..45f3e81 100644 --- a/tag-emacs/emacs.d/init.org +++ b/tag-emacs/emacs.d/init.org @@ -475,7 +475,10 @@ occasions that I’m working with something other than git. :defer t :bind (("C-x v C" . vc-resolve-conflicts)) :config (progn - (setq vc-follow-symlinks t))) + (setq vc-follow-symlinks t) + (setq vs-ignore-dir-regexp (format "\\(%s\\)\\|\\(%s\\)" + vc-ignore-dir-regexp + tramp-file-name-regexp)))) #+END_SRC ** git-gutter-fringe |