diff options
| author | Jonas Bernoulli <jonas@bernoul.li> | 2025-03-25 17:19:33 +0100 |
|---|---|---|
| committer | Jonas Bernoulli <jonas@bernoul.li> | 2025-03-25 17:19:33 +0100 |
| commit | 280fa3ddab5da375ed977660674cfa1db680c901 (patch) | |
| tree | 2e629c24802c479e1eb8ebca95b0db1a3d7a1437 /docs | |
| parent | 83780a2805d01c08849d40602958dcad215983ff (diff) | |
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
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/magit.org | 2 | ||||
| -rw-r--r-- | docs/magit.texi | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/docs/magit.org b/docs/magit.org index 6e54a5f..19d86ad 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 9c70611..eced27f 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. |