Commit 728052be authored by Jonas Bernoulli's avatar Jonas Bernoulli

Rename magit-merge to magit-merge-plain

See #3619.
parent 822e762c
......@@ -8,7 +8,7 @@
#+TEXINFO_DIR_CATEGORY: Emacs
#+TEXINFO_DIR_TITLE: Magit: (magit).
#+TEXINFO_DIR_DESC: Using Git from Emacs with Magit.
#+SUBTITLE: for version 2.13.0 (2.13.0-305-g55b79be8f+1)
#+SUBTITLE: for version 2.13.0 (2.13.0-307-g822e762cd+1)
#+BIND: ox-texinfo+-before-export-hook ox-texinfo+-update-version-strings
#+TEXINFO_DEFFN: t
......@@ -23,7 +23,7 @@ directly from within Emacs. While many fine Git clients exist, only
Magit and Git itself deserve to be called porcelains.
#+TEXINFO: @noindent
This manual is for Magit version 2.13.0 (2.13.0-305-g55b79be8f+1).
This manual is for Magit version 2.13.0 (2.13.0-307-g822e762cd+1).
#+BEGIN_QUOTE
Copyright (C) 2015-2018 Jonas Bernoulli <jonas@bernoul.li>
......@@ -4727,7 +4727,7 @@ merge conflicts see the next section.
When no merge is in progress, then the popup buffer features the
following commands.
- Key: m m, magit-merge
- Key: m m, magit-merge-plain
This command merges another branch or an arbitrary revision into the
current branch. The branch or revision to be merged is read in the
......
......@@ -31,7 +31,7 @@ General Public License for more details.
@finalout
@titlepage
@title Magit User Manual
@subtitle for version 2.13.0 (2.13.0-305-g55b79be8f+1)
@subtitle for version 2.13.0 (2.13.0-307-g822e762cd+1)
@author Jonas Bernoulli
@page
@vskip 0pt plus 1filll
......@@ -53,7 +53,7 @@ directly from within Emacs. While many fine Git clients exist, only
Magit and Git itself deserve to be called porcelains.
@noindent
This manual is for Magit version 2.13.0 (2.13.0-305-g55b79be8f+1).
This manual is for Magit version 2.13.0 (2.13.0-307-g822e762cd+1).
@quotation
Copyright (C) 2015-2018 Jonas Bernoulli <jonas@@bernoul.li>
......@@ -6376,8 +6376,8 @@ following commands.
@table @asis
@kindex m m
@cindex magit-merge
@item @kbd{m m} @tie{}@tie{}@tie{}@tie{}(@code{magit-merge})
@cindex magit-merge-plain
@item @kbd{m m} @tie{}@tie{}@tie{}@tie{}(@code{magit-merge-plain})
This command merges another branch or an arbitrary revision into the
current branch. The branch or revision to be merged is read in the
......
......@@ -38,7 +38,7 @@
:switches '((?f "Fast-forward only" "--ff-only")
(?n "No fast-forward" "--no-ff"))
:options '((?s "Strategy" "--strategy="))
:actions '((?m "Merge" magit-merge)
:actions '((?m "Merge" magit-merge-plain)
(?p "Preview merge" magit-merge-preview)
(?e "Merge and edit message" magit-merge-editmsg) nil
(?n "Merge but don't commit" magit-merge-nocommit)
......@@ -52,7 +52,7 @@
:max-action-columns 2)
;;;###autoload
(defun magit-merge (rev &optional args nocommit)
(defun magit-merge-plain (rev &optional args nocommit)
"Merge commit REV into the current branch; using default message.
Unless there are conflicts or a prefix argument is used create a
......
......@@ -41,6 +41,7 @@
(define-obsolete-function-alias 'magit-blame 'magit-blame-addition "Magit 2.90.0")
(define-obsolete-function-alias 'magit-revert 'magit-revert-and-commit "Magit 2.90.0")
(define-obsolete-function-alias 'magit-reset 'magit-reset-quickly "Magit 2.90.0")
(define-obsolete-function-alias 'magit-merge 'magit-merge-plain "Magit 2.90.0")
;;; _
(provide 'magit-obsolete)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment