Merge branch 'tkf/fix-manual-merge'

azuk · Jun 16, 2012 · d3c62bd · d3c62bd
2 parents 46662c9 + 75d2da9
commit d3c62bd
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/magit-key-mode.el b/magit-key-mode.el
@@ -120,7 +120,6 @@
      (switches
       ("-ff" "Fast-forward only" "--ff-only")
       ("-nf" "No fast-forward" "--no-ff")
-      ("-nc" "No commit" "--no-commit")
       ("-sq" "Squash" "--squash"))
      (arguments
       ("-st" "Strategy" "--strategy=" read-from-minibuffer)))

diff --git a/magit.el b/magit.el
@@ -3646,7 +3646,10 @@ user input."
 \('git merge REVISION')."
   (interactive (list (magit-read-rev "Merge" (magit-guess-branch))))
   (when revision
-    (magit-run-git "merge" "--no-commit" (magit-rev-to-git revision))
+    (apply 'magit-run-git
+           "merge" "--no-commit"
+           (magit-rev-to-git revision)
+           magit-custom-options)
     (when (file-exists-p ".git/MERGE_MSG")
         (magit-log-edit))))