From 42fc3dac9cba6158c6214cce70cab48d4f647a09 Mon Sep 17 00:00:00 2001 From: Phil Jackson Date: Wed, 1 Sep 2010 22:27:39 +0100 Subject: [PATCH] Remove rebase behaviour from pull. --- magit.el | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/magit.el b/magit.el index ad1afa11..60c99f44 100644 --- a/magit.el +++ b/magit.el @@ -2913,17 +2913,16 @@ update it." (remote (magit-run-git-async "fetch" remote)) (t (magit-run-git-async "remote" "update")))) -(magit-define-command pull (&optional rebase) - "Run git pull against the current remote. With a prefix arg -will run pull with --rebase." - (interactive "P") +(magit-define-command pull () + "Run git pull against the current remote." + (interactive) (let* ((branch (magit-get-current-branch)) (config-branch (and branch (magit-get "branch" branch "merge"))) (merge-branch (or config-branch (magit-read-rev (format "Pull from"))))) (if (and branch (not config-branch)) (magit-set merge-branch "branch" branch "merge")) - (apply 'magit-run-git-async `("pull" "-v" ,@(and rebase '("--rebase")))))) + (apply 'magit-run-git-async `("pull" "-v")))) (eval-when-compile (require 'pcomplete))