Commit e4ba1386 authored by Jonas Bernoulli's avatar Jonas Bernoulli

Rename magit-pull to magit-pull-branch

See #3619.
parent 7ba277bd
......@@ -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-300-g34f69987c+1)
#+SUBTITLE: for version 2.13.0 (2.13.0-301-g7ba277bd1+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-300-g34f69987c+1).
This manual is for Magit version 2.13.0 (2.13.0-301-g7ba277bd1+1).
#+BEGIN_QUOTE
Copyright (C) 2015-2018 Jonas Bernoulli <jonas@bernoul.li>
......@@ -5790,7 +5790,7 @@ Also see [[man:git-pull]]
Pull from the upstream of the current branch.
- Key: F e, magit-pull
- Key: F e, magit-pull-branch
Pull from a branch read in the minibuffer.
......
......@@ -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-300-g34f69987c+1)
@subtitle for version 2.13.0 (2.13.0-301-g7ba277bd1+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-300-g34f69987c+1).
This manual is for Magit version 2.13.0 (2.13.0-301-g7ba277bd1+1).
@quotation
Copyright (C) 2015-2018 Jonas Bernoulli <jonas@@bernoul.li>
......@@ -7868,8 +7868,8 @@ Pull from the push-remote of the current branch.
Pull from the upstream of the current branch.
@kindex F e
@cindex magit-pull
@item @kbd{F e} @tie{}@tie{}@tie{}@tie{}(@code{magit-pull})
@cindex magit-pull-branch
@item @kbd{F e} @tie{}@tie{}@tie{}@tie{}(@code{magit-pull-branch})
Pull from a branch read in the minibuffer.
@end table
......
......@@ -532,7 +532,7 @@ which visits the thing at point using `browse-url'."
["Rebase..." magit-rebase-popup t]
"---"
["Push" magit-push t]
["Pull" magit-pull t]
["Pull" magit-pull-branch t]
["Remote update" magit-fetch-all t]
("Submodule"
["Submodule update" magit-submodule-update t]
......
......@@ -36,6 +36,7 @@
(define-obsolete-function-alias 'magit-branch 'magit-branch-create "Magit 2.90.0")
(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")
;;; _
(provide 'magit-obsolete)
......
......@@ -573,7 +573,7 @@ prefix argument fetch all remotes."
(propertize "Pull from" 'face 'magit-popup-heading)))
(?p magit-get-push-branch magit-pull-from-pushremote)
(?u magit-get-upstream-branch magit-pull-from-upstream)
(?e "elsewhere" magit-pull))
(?e "elsewhere" magit-pull-branch))
:default-action 'magit-pull
:max-action-columns 1)
......@@ -618,7 +618,7 @@ missing. To add them use something like:
(propertize "Pull from" 'face 'magit-popup-heading)))
(?p magit-get-push-branch magit-pull-from-pushremote)
(?u magit-get-upstream-branch magit-pull-from-upstream)
(?e "elsewhere" magit-pull)
(?e "elsewhere" magit-pull-branch)
"Fetch from"
(?f "remotes" magit-fetch-all-no-prune)
(?F "remotes and prune" magit-fetch-all-prune)
......@@ -664,7 +664,7 @@ missing. To add them use something like:
(user-error "No branch is checked out"))))
;;;###autoload
(defun magit-pull (source args)
(defun magit-pull-branch (source args)
"Pull from a branch read in the minibuffer."
(interactive (list (magit-read-remote-branch "Pull" nil nil nil t)
(magit-pull-arguments)))
......
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