X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=setup%2Fmagit.el;fp=setup%2Fmagit.el;h=ebf043e4cff0cf97760d47de7c3870ccd71ccf28;hb=28a13bd0b8508bbab5e79108e5d32d2edc357baa;hp=91c70f2690e018666abdfc07ebc422a2e8e6b0f0;hpb=26914a98eea51a46872bacef7c2dcf8ba96a50de;p=emacs-init.git

diff --git a/setup/magit.el b/setup/magit.el
index 91c70f2..ebf043e 100644
--- a/setup/magit.el
+++ b/setup/magit.el
@@ -223,11 +223,11 @@
 
 (global-set-key "\C-cGH" 'dired-grep-git-files)
 
-(defun magit-svn-fetch ()
-  (interactive)
-  (magit-run-git-async "svn" "fetch"))
+;; (defun magit-svn-fetch ()
+;;   (interactive)
+;;   (magit-run-git-async "svn" "fetch"))
 
-(define-key magit-mode-map "Nf" 'magit-svn-fetch)
+;; (define-key magit-mode-map "Nf" 'magit-svn-fetch)
 
 (defun magit-quit-window (&optional kill-buffer)
   (interactive "P")
@@ -246,7 +246,8 @@
 
 (defun magit-reset-to-upstream ()
   (interactive)
-  (magit-run-git "reset" "--hard" "@{u}"))
+  (if (yes-or-no-p "Remove local history and hard reset HEAD? ")
+    (magit-run-git "reset" "--hard" "@{u}")))
 
 (magit-define-popup-action 'magit-pull-popup
   ?X "HARD Reset to upstream (force pull after remote rebase)" 'magit-reset-to-upstream)