diff options
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. |