From feb8dee1bca86d55e8f2cbc9bdaf18690a1f13f5 Mon Sep 17 00:00:00 2001 From: Marius Vollmer Date: Wed, 6 Aug 2008 01:22:12 +0300 Subject: [PATCH] Actually pass the branch to git-merge... --- mgit.el | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mgit.el b/mgit.el index 51ec1945..c2d18026 100644 --- a/mgit.el +++ b/mgit.el @@ -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