Permalink
Browse files

Merge branch 'tkf/fix-manual-merge'

  • Loading branch information...
2 parents 46662c9 + 75d2da9 commit d3c62bd47c6272a3f5c5b85498f0594b37dc93e7 @sigma sigma committed Jun 16, 2012
Showing with 4 additions and 2 deletions.
  1. +0 −1 magit-key-mode.el
  2. +4 −1 magit.el
View
@@ -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)))
View
@@ -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))))

0 comments on commit d3c62bd

Please sign in to comment.