From baf150322c559c2fc0b9d3edf17126752e64d9b5 Mon Sep 17 00:00:00 2001 From: Kyle Meyer Date: Sun, 17 Jan 2016 01:19:48 -0500 Subject: Update for upstream Magit revert changes --- init.el | 4 +--- lisp/km-magit.el | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/init.el b/init.el index 7b303f0..02f7dc8 100644 --- a/init.el +++ b/init.el @@ -787,9 +787,7 @@ (define-prefix-command 'km/magit-wip-map) (define-key km/git-map "w" 'km/magit-wip-map) :config - (setq magit-revert-buffers 'silent - magit-revert-buffers-only-for-tracked-files nil - magit-push-always-verify nil + (setq magit-push-always-verify nil magit-delete-by-moving-to-trash nil magit-diff-auto-show-delay 0.1 magit-revision-show-gravatars nil diff --git a/lisp/km-magit.el b/lisp/km-magit.el index 616f975..1dba7bd 100644 --- a/lisp/km-magit.el +++ b/lisp/km-magit.el @@ -143,7 +143,7 @@ without requiring confirmation. branch) current-prefix-arg))) (unless (string= old new) - (magit-run-git-no-revert "branch" (if force "-M" "-m") old new))) + (magit-run-git "branch" (if force "-M" "-m") old new))) (defun km/magit-delete-previous-branch (&optional force) "Delete previous branch. -- cgit v1.2.3