emacs: magit

[ian-dotfiles.git] / home / emacs / ian.el

diff --git a/home/emacs/ian.el b/home/emacs/ian.el
index 28cf1e76cb32f2170281212b6a06588a1cd84cf6..e50a1f0598f5cb2c3f894dc0e98f276cc11c62d1 100644 (file)
--- a/home/emacs/ian.el
+++ b/home/emacs/ian.el
@@ -103,6 +103,8 @@
   (global-set-key "\18\v" 'quicker-compile)
   (global-set-key "\18\18" 'exchange-point-and-mark)
   (global-set-key "\18\1a" 'load-tramp)
+  (global-set-key "\18g" 'magit-status)
+  (global-set-key "\18\eg" 'magit-dispatch-popup)
   (global-set-key "\184\16" 'scroll-other-window)
   (global-set-key "\184m" 'vm-mail-other-window)
   (global-set-key "\189" 'vm-visit-folder)
@@ -549,6 +551,15 @@ The citation string is taken from cite-string."
 
 (winner-mode t)
 
+(global-magit-file-mode)
+
+(magit-wip-after-save-mode)
+(magit-wip-after-apply-mode)
+(magit-wip-before-change-mode)
+(setq magit-no-confirm
+      (append magit-no-confirm '(safe-with-wip)))
+
+(setq vc-handled-backends (delq 'Git vc-handled-backends))
 
 ;; (defun hack-dir-local-variables ()
 ;;   "Read per-directory local variables for the current buffer.