diff options
author | Kyle Meyer <kyle@kyleam.com> | 2016-01-17 01:19:48 -0500 |
---|---|---|
committer | Kyle Meyer <kyle@kyleam.com> | 2016-01-17 01:19:48 -0500 |
commit | baf150322c559c2fc0b9d3edf17126752e64d9b5 (patch) | |
tree | a6c901b01c163d7a18d9e2a4491f5bbf43af2373 | |
parent | 5683a910d2ff4cdf8f3ac1b3ebda0ed2e10fed99 (diff) | |
download | emacs.d-baf150322c559c2fc0b9d3edf17126752e64d9b5.tar.gz |
Update for upstream Magit revert changes
-rw-r--r-- | init.el | 4 | ||||
-rw-r--r-- | lisp/km-magit.el | 2 |
2 files changed, 2 insertions, 4 deletions
@@ -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. |