Commit f64ed3f1 authored by Jonas Bernoulli's avatar Jonas Bernoulli

magit-pull-popup: replace --rebase with branch.<name>.rebase

parent 31088055
......@@ -164,7 +164,9 @@ Then show the status buffer for the new repository."
"Popup console for pull commands."
'magit-commands
:man-page "git-pull"
:switches '((?r "Rebase" "--rebase"))
:variables '((?r "branch.%s.rebase"
magit-cycle-branch*rebase
magit-pull-format-branch*rebase))
:actions '((lambda ()
(--if-let (magit-get-current-branch)
(concat
......@@ -178,6 +180,12 @@ Then show the status buffer for the new repository."
:default-action 'magit-pull
:max-action-columns 1)
(defun magit-pull-format-branch*rebase ()
(magit-popup-format-variable (format "branch.%s.rebase"
(or (magit-get-current-branch) "<name>"))
'("true" "false")
"false" "pull.rebase"))
(defun magit-git-pull (source args)
(run-hooks 'magit-credential-hook)
(-let [(remote . branch)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment