   (setq magit-log-arguments (append
                              (list "--color")
                              magit-log-arguments))
-  ;; show status buffer alone
-  (setq magit-post-display-buffer-hook
-        (lambda ()
-          (when (derived-mode-p 'magit-status-mode)
-            (delete-other-windows))))
+  (setq magit-display-buffer-function
+        #'magit-display-buffer-same-window-except-diff-v1)
+  ;; to display fullframe, use 'magit-display-buffer-fullframe-status-v1
   )
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; git-timemachine ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

;; Author: Dan Harms <danielrharms@gmail.com>
;; Created: Friday, February 27, 2015
;; Version: 1.0
;; Modified Time-stamp: <2017-02-13 16:42:04 dan.harms>
;; Modified by: Dan Harms
;; Keywords:


  (magit-auto-revert-mode 0)
  (setq magit-repository-directories
        `(,(cons (expand-file-name "~/src") 2)))
  (add-hook 'magit-post-refresh-hook 'diff-hl-magit-post-refresh)
  ;; add ido shortcut
  (if (version< emacs-version "25.1")
      (add-hook
