branch: elpa/magit
commit 280fa3ddab5da375ed977660674cfa1db680c901
Author: Jonas Bernoulli <[email protected]>
Commit: Jonas Bernoulli <[email protected]>
magit-merge-into: Rename to magit-merge-dissolve and change binding
Use the term "dissolve" because that makes it clear that the branch that
is being merged is also deleted afterwards. Also change the key binding
in the `magit-merge' menu, to keep it mnemonic. At least the latter was
planned since [1: 4c096921fd]. Do not define `magit-merge-into' as an
obsolete alias, since that would prolong the period during which some
users would by take by surprise.
Re #4386.
1: 2021-07-01 4c096921fda97ebdff656a35a257910fca9e5aad
magit-merge: Change magit-merge-into's description
---
docs/magit.org | 2 +-
docs/magit.texi | 6 +++---
lisp/magit-merge.el | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/docs/magit.org b/docs/magit.org
index 6e54a5f9e97..19d86ad7317 100644
--- a/docs/magit.org
+++ b/docs/magit.org
@@ -5768,7 +5768,7 @@ following suffix commands.
Finally, if ~magit-branch-pull-request~ was used to create the merged
branch, then the respective remote branch is also removed.
-- Key: m i (magit-merge-into) ::
+- Key: m d (magit-merge-dissolve) ::
This command merges the current branch into another local branch and
then removes the former. The latter becomes the new current branch.
diff --git a/docs/magit.texi b/docs/magit.texi
index 9c7061145ce..eced27f4656 100644
--- a/docs/magit.texi
+++ b/docs/magit.texi
@@ -6819,9 +6819,9 @@ stuck on some obsolete version of the commits that are
being merged.
Finally, if @code{magit-branch-pull-request} was used to create the merged
branch, then the respective remote branch is also removed.
-@item @kbd{m i} (@code{magit-merge-into})
-@kindex m i
-@findex magit-merge-into
+@item @kbd{m d} (@code{magit-merge-dissolve})
+@kindex m d
+@findex magit-merge-dissolve
This command merges the current branch into another local branch and
then removes the former. The latter becomes the new current branch.
diff --git a/lisp/magit-merge.el b/lisp/magit-merge.el
index 779bda5fe90..2d82ceeda11 100644
--- a/lisp/magit-merge.el
+++ b/lisp/magit-merge.el
@@ -58,7 +58,7 @@
[("p" "Preview merge" magit-merge-preview)
""
("s" "Squash merge" magit-merge-squash)
- ("i" "Dissolve" magit-merge-into)]]
+ ("d" "Dissolve" magit-merge-dissolve)]]
["Actions"
:if magit-merge-in-progress-p
("m" "Commit merge" magit-commit-create)
@@ -129,7 +129,7 @@ inspect the merge and change the commit message.
(magit-run-git-async "merge" "--no-commit" args rev))
;;;###autoload
-(defun magit-merge-into (branch &optional args)
+(defun magit-merge-dissolve (branch &optional args)
"Merge the current branch into BRANCH and remove the former.
Before merging, force push the source branch to its push-remote,
