Commit bdebdfcf consolidated `magit-{manual,automatic}-merge' into
`magit-merge' but neglected to update its docstring (which had been
wrong to begin with, since commit 9522698c).Signed-off-by: Pieter Praet <[email protected]> --- magit.el | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/magit.el b/magit.el index a39fee4..ea9a16c 100644 --- a/magit.el +++ b/magit.el @@ -4586,9 +4586,8 @@ (defun magit-remove-conflicts (alist) (magit-log-edit)))) (defun magit-merge (revision) - "Merge REVISION into the current 'HEAD'; leave changes uncommitted. -With a prefix-arg, the merge will be squashed. -\('git merge --no-commit [--squash|--no-ff] REVISION')." + "Merge REVISION into the current 'HEAD'; commit unless merge fails. +\('git merge REVISION')." (interactive (list (magit-read-rev-with-default "Merge"))) (apply 'magit-run-git "merge" -- 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.
