Commit 51f946f2 authored by Jonas Bernoulli's avatar Jonas Bernoulli

Rename magit-rebase to magit-rebase-branch

See #3619.
parent e4ba1386
......@@ -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-301-g7ba277bd1+1)
#+SUBTITLE: for version 2.13.0 (2.13.0-302-ge4ba1386f+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-301-g7ba277bd1+1).
This manual is for Magit version 2.13.0 (2.13.0-302-ge4ba1386f+1).
#+BEGIN_QUOTE
Copyright (C) 2015-2018 Jonas Bernoulli <jonas@bernoul.li>
......@@ -4946,7 +4946,7 @@ See [[*Information About In-Progress Rebase]].
Rebase the current branch onto its upstream branch.
- Key: r e, magit-rebase
- Key: r e, magit-rebase-branch
Rebase the current branch onto a branch read in the minibuffer. All
commits that are reachable from head but not from the selected
......
......@@ -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-301-g7ba277bd1+1)
@subtitle for version 2.13.0 (2.13.0-302-ge4ba1386f+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-301-g7ba277bd1+1).
This manual is for Magit version 2.13.0 (2.13.0-302-ge4ba1386f+1).
@quotation
Copyright (C) 2015-2018 Jonas Bernoulli <jonas@@bernoul.li>
......@@ -6638,8 +6638,8 @@ variable is unset, then rebase onto @code{remote.pushDefault}.
Rebase the current branch onto its upstream branch.
@kindex r e
@cindex magit-rebase
@item @kbd{r e} @tie{}@tie{}@tie{}@tie{}(@code{magit-rebase})
@cindex magit-rebase-branch
@item @kbd{r e} @tie{}@tie{}@tie{}@tie{}(@code{magit-rebase-branch})
Rebase the current branch onto a branch read in the minibuffer. All
commits that are reachable from head but not from the selected
......
......@@ -37,6 +37,7 @@
(define-obsolete-function-alias 'magit-tag 'magit-tag-create "Magit 2.90.0")
(define-obsolete-function-alias 'magit-fetch 'magit-fetch-other "Magit 2.90.0")
(define-obsolete-function-alias 'magit-pull 'magit-pull-branch "Magit 2.90.0")
(define-obsolete-function-alias 'magit-rebase 'magit-rebase-branch "Magit 2.90.0")
;;; _
(provide 'magit-obsolete)
......
......@@ -475,7 +475,7 @@ This discards all changes made since the sequence started."
(?u (lambda ()
(--when-let (magit-get-upstream-branch) (concat it "\n")))
magit-rebase-onto-upstream)
(?e "elsewhere" magit-rebase)
(?e "elsewhere" magit-rebase-branch)
"Rebase"
(?i "interactively" magit-rebase-interactive)
(?m "to modify a commit" magit-rebase-edit-commit)
......@@ -517,7 +517,7 @@ If that variable is unset, then rebase onto `remote.pushDefault'."
(user-error "No branch is checked out")))
;;;###autoload
(defun magit-rebase (target args)
(defun magit-rebase-branch (target args)
"Rebase the current branch onto a branch read in the minibuffer.
All commits that are reachable from `HEAD' but not from the
selected branch TARGET are being rebased."
......
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