From 31387d2f505f544a206d0d15ceef92f504faa9cc Mon Sep 17 00:00:00 2001
From: Phil Jackson <phil@shellarchive.co.uk>
Date: Fri, 3 Sep 2010 19:04:54 +0100
Subject: [PATCH] Prefix arg allows pulling from a specified location.

---
 magit.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/magit.el b/magit.el
index 186772f5..5e13b404 100644
--- a/magit.el
+++ b/magit.el
@@ -2917,7 +2917,7 @@ Uncomitted changes in both working tree and staging area are lost.
   (interactive)
   (let* ((branch (magit-get-current-branch))
 	 (config-branch (and branch (magit-get "branch" branch "merge")))
-	 (merge-branch (or config-branch
+	 (merge-branch (or (and config-branch (not current-prefix-arg))
 			   (magit-read-rev (format "Pull from")))))
     (if (and branch (not config-branch))
 	(magit-set merge-branch "branch" branch "merge"))