It's pretty much a duplicate of `magit-merge'. The only differences are that it uses `magit-read-rev' + `magit-guess-branch' instead of `magit-read-rev-with-default', and it doesn't pass `magit-custom-options' to `magit-run-git'.
Also, it's no longer in use: Added in 7dce8dc8, removed in bdebdfcf, re-added in 08ebe7df as a fix for issue #57, retired in 60a35bc2. Signed-off-by: Pieter Praet <[email protected]> --- magit.el | 6 ------ 1 file changed, 6 deletions(-) diff --git a/magit.el b/magit.el index ea9a16c..032a013 100644 --- a/magit.el +++ b/magit.el @@ -4567,12 +4567,6 @@ (defun magit-remove-conflicts (alist) ;;; Acting (1) ;;;; Merging -(magit-define-command automatic-merge (revision) - "Merge REVISION into the current 'HEAD'; commit unless merge fails. -\('git merge REVISION')." - (interactive (list (magit-read-rev "Merge" (magit-guess-branch)))) - (magit-run-git "merge" (magit-rev-to-git revision))) - (magit-define-command manual-merge (revision) "Merge REVISION into the current 'HEAD'; leave changes uncommitted. \('git merge --no-commit REVISION')." -- 1.7.11.1 -- --- You received this message because you are subscribed to the Google Groups "magit" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. For more options, visit https://groups.google.com/groups/opt_out.
