gwh/slackbuilds
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

When pulling, ask for branch if none is configured.

Browse source 
* magit.el (magit-pull): Here.
This commit is contained in:
Marius Vollmer 2009-03-22 01:21:02 +02:00
parent 27389b9e5e
commit 9af5c9b707
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
magit.el
View file

@ -2161,7 +2161,13 @@ in log buffer."
(defun magit-pull ()
(interactive)
(magit-run-git-async "pull" "-v"))
(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"))
(magit-run-git-async "pull" "-v")))
(defun magit-read-remote (prompt def)
(completing-read (if def