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

When pushing a new branch, manually add merge configuration.

Browse source
This commit is contained in:
Nathan Weizenbaum 2010-06-24 16:56:18 -07:00
parent 9b195b61e9
commit a5b72daa02
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
magit.el
View file

@ -3045,7 +3045,12 @@ typing and automatically refreshes the status buffer."
(magit-run-git-async "push" "-v" push-remote (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))
;; 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),
;; so we have to do that manually.
(unless ref-branch
(magit-set (concat "refs/heads/" branch) "branch" branch "merge"))))
;;; Log edit mode ;;; Log edit mode