From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 11 Aug 2018 08:45:13 +0000 (+0100)
Subject: emacs: magit
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=commitdiff_plain;h=afe244fa3c0adf451fd142db3570bcf39a92f36b;p=ian-dotfiles.git

emacs: magit
---

diff --git a/home/emacs/ian.el b/home/emacs/ian.el
index 28cf1e7..e50a1f0 100644
--- a/home/emacs/ian.el
+++ b/home/emacs/ian.el
@@ -103,6 +103,8 @@
   (global-set-key "" 'quicker-compile)
   (global-set-key "" 'exchange-point-and-mark)
   (global-set-key "" 'load-tramp)
+  (global-set-key "g" 'magit-status)
+  (global-set-key "g" 'magit-dispatch-popup)
   (global-set-key "4" 'scroll-other-window)
   (global-set-key "4m" 'vm-mail-other-window)
   (global-set-key "9" '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.