         ;; magit-svn
         smeargle
         ))
+
+(defun git/init-evil-magit ()
+  (with-eval-after-load 'magit
+    (setq evil-magit-state 'motion)
+    (require 'evil-magit)))
 
 (defun git/init-helm-gitignore ()
   (use-package helm-gitignore


(setq git-packages
      '(
        gitattributes-mode
        gitconfig-mode
        gitignore-mode

                (pop-to-buffer buffer)
                (delete-other-windows))))

      (when dotspacemacs-major-mode-leader-key
        (add-hook 'with-editor-mode-hook 'evil-normalize-keymaps)
        (evil-define-key 'normal with-editor-mode-map
          (concat dotspacemacs-major-mode-leader-key "c") 'with-editor-finish
          (concat dotspacemacs-major-mode-leader-key "a") 'with-editor-cancel)
        (evil-define-key 'motion with-editor-mode-map
          (concat dotspacemacs-major-mode-leader-key "c") 'with-editor-finish
          (concat dotspacemacs-major-mode-leader-key "a") 'with-editor-cancel))

      ;; whitespace
      (defun magit-toggle-whitespace ()
