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

Added -n to push menu. Added magit-custom-options to push command.

Browse source
This commit is contained in:
Phil Jackson 2010-09-01 23:50:25 +01:00
parent 564726a247
commit 78a3d703b0
2 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
magit-key-mode.el
View file

@ -170,7 +170,9 @@
(pushing (pushing
(actions (actions
("p" "Push" magit-push))) ("p" "Push" magit-push))
(switches
("-d" "Dry run" "-n")))
(pulling (pulling
(actions (actions

5
magit.el
View file

@ -2967,10 +2967,11 @@ typing and automatically refreshes the status buffer."
(if (and (not branch-remote) (if (and (not branch-remote)
(not current-prefix-arg)) (not current-prefix-arg))
(magit-set push-remote "branch" branch "remote")) (magit-set push-remote "branch" branch "remote"))
(magit-run-git-async "push" "-v" push-remote (apply 'magit-run-git-async "push" "-v" push-remote
(if ref-branch (if ref-branch
(format "%s:%s" branch ref-branch) (format "%s:%s" branch ref-branch)
branch)) branch)
magit-custom-options)
;; Although git will automatically set up the remote, ;; Although git will automatically set up the remote,
;; it doesn't set up the branch to merge (at least as of Git 1.6.6.1), ;; it doesn't set up the branch to merge (at least as of Git 1.6.6.1),
;; so we have to do that manually. ;; so we have to do that manually.