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

Prefix arg allows pulling from a specified location.

Browse source
This commit is contained in:
Phil Jackson 2010-09-03 19:04:54 +01:00
parent 2733adb8b6
commit 31387d2f50
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
magit.el
View file

@ -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"))