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

Actually pass the branch to git-merge...

Browse source
This commit is contained in:
Marius Vollmer 2008-08-06 01:22:12 +03:00
parent 7dce8dc86d
commit feb8dee1bc
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
mgit.el
View file

@ -368,11 +368,11 @@
(defun mgit-manual-merge (branch)
(interactive (list (mgit-read-other-branch "Manually merge from branch: ")))
(mgit-run "git" "merge" "--no-ff" "--no-commit"))
(mgit-run "git" "merge" "--no-ff" "--no-commit" branch))
(defun mgit-automatic-merge (branch)
(interactive (list (mgit-read-other-branch "Merge from branch: ")))
(mgit-run "git" "merge"))
(mgit-run "git" "merge" branch))
;;; Push and pull