Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Merge branch 'tkf/fix-manual-merge'

  • Loading branch information...
commit d3c62bd47c6272a3f5c5b85498f0594b37dc93e7 2 parents 46662c9 + 75d2da9
Yann Hodique authored June 16, 2012
1  magit-key-mode.el
@@ -120,7 +120,6 @@
120 120
      (switches
121 121
       ("-ff" "Fast-forward only" "--ff-only")
122 122
       ("-nf" "No fast-forward" "--no-ff")
123  
-      ("-nc" "No commit" "--no-commit")
124 123
       ("-sq" "Squash" "--squash"))
125 124
      (arguments
126 125
       ("-st" "Strategy" "--strategy=" read-from-minibuffer)))
5  magit.el
@@ -3646,7 +3646,10 @@ user input."
3646 3646
 \('git merge REVISION')."
3647 3647
   (interactive (list (magit-read-rev "Merge" (magit-guess-branch))))
3648 3648
   (when revision
3649  
-    (magit-run-git "merge" "--no-commit" (magit-rev-to-git revision))
  3649
+    (apply 'magit-run-git
  3650
+           "merge" "--no-commit"
  3651
+           (magit-rev-to-git revision)
  3652
+           magit-custom-options)
3650 3653
     (when (file-exists-p ".git/MERGE_MSG")
3651 3654
         (magit-log-edit))))
3652 3655
 

0 notes on commit d3c62bd

Please sign in to comment.
Something went wrong with that request. Please try again.