magit

[dotemacs] / lisp / my-vc.el

diff --git a/lisp/my-vc.el b/lisp/my-vc.el
index cba3ea98019e6f2f4456e5f02ccb32fcef8ce32e..a2b65de5d3d9f824f404a8bdfef4a5b4c9ee23b8 100644 (file)
--- a/lisp/my-vc.el
+++ b/lisp/my-vc.el
@@ -6,7 +6,8 @@
 
 
 (require 'git-gutter)
-(require 'git-gutter-fringe)
+
+(add-hook 'git-gutter:update-hooks 'magit-revert-buffer-hook)
 
 (setq git-gutter:ask-p nil)
 
@@ -21,15 +22,6 @@
 
 
 
-(defun my/git-reset-buffer ()
-  "Runs git-reset to unstage all changes on the current file. Then updates the git-gutter."
-  (interactive)
-  (call-process "git" nil nil nil "reset" (buffer-file-name))
-  (git-gutter)
-  (message "Finished git reset"))
-
-
-
 (require 'ibuffer-vc)
 
 (add-hook 'ibuffer-hook
@@ -40,5 +32,14 @@
 
 
 
+(require 'magit)
+
+(setq magit-completing-read-function 'ivy-completing-read)
+(setq magit-display-file-buffer-function #'pop-to-buffer)
+(global-magit-file-mode)
+
+
+
 (require 'vc)
 (setq vc-follow-symlinks t)
+(setq vc-handled-backends nil)