Commit 27832e7d authored by Jonas Bernoulli's avatar Jonas Bernoulli

Rename magit-branch to magit-branch-create

See #3619.
parent 544d428b
......@@ -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-297-g475b65975+1)
#+SUBTITLE: for version 2.13.0 (2.13.0-298-g544d428b8+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-297-g475b65975+1).
This manual is for Magit version 2.13.0 (2.13.0-298-g544d428b8+1).
#+BEGIN_QUOTE
Copyright (C) 2015-2018 Jonas Bernoulli <jonas@bernoul.li>
......@@ -4227,7 +4227,7 @@ features are available from separate popups.
else then ~HEAD~ becomes detached. Checkout fails if the working tree
or the staging area contain changes.
- Key: b n, magit-branch
- Key: b n, magit-branch-create
Create a new branch. The user is asked for a branch or arbitrary
revision to use as the starting point of the new branch. When a
......
......@@ -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-297-g475b65975+1)
@subtitle for version 2.13.0 (2.13.0-298-g544d428b8+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-297-g475b65975+1).
This manual is for Magit version 2.13.0 (2.13.0-298-g544d428b8+1).
@quotation
Copyright (C) 2015-2018 Jonas Bernoulli <jonas@@bernoul.li>
......@@ -5719,8 +5719,8 @@ else then @code{HEAD} becomes detached. Checkout fails if the working tree
or the staging area contain changes.
@kindex b n
@cindex magit-branch
@item @kbd{b n} @tie{}@tie{}@tie{}@tie{}(@code{magit-branch})
@cindex magit-branch-create
@item @kbd{b n} @tie{}@tie{}@tie{}@tie{}(@code{magit-branch-create})
Create a new branch. The user is asked for a branch or arbitrary
revision to use as the starting point of the new branch. When a
......
......@@ -214,7 +214,7 @@ and change branch related variables."
(?s "Create new spin-off" magit-branch-spinoff)
(?m "Rename" magit-branch-rename)
(?c "Checkout new branch" magit-branch-and-checkout)
(?n "Create new branch" magit-branch)
(?n "Create new branch" magit-branch-create)
(?x "Reset" magit-branch-reset)
(?w "Checkout new worktree" magit-worktree-checkout)
(?W "Create new worktree" magit-worktree-branch)
......@@ -249,7 +249,7 @@ changes.
(magit-run-git "checkout" revision))
;;;###autoload
(defun magit-branch (branch start-point &optional args)
(defun magit-branch-create (branch start-point &optional args)
"Create BRANCH at branch or revision START-POINT.
\n(git branch [ARGS] BRANCH START-POINT)."
(interactive (magit-branch-read-args "Create branch"))
......@@ -393,7 +393,7 @@ Please see the manual for more information."
(unless (magit-branch-p tracking)
(magit-call-git "fetch" upstream))
(let ((inhibit-magit-refresh t))
(magit-branch branch tracking))
(magit-branch-create branch tracking))
(magit-set upstream "branch" branch "pushRemote")
(magit-set upstream "branch" branch "pullRequestRemote"))
(if (magit-remote-p remote)
......@@ -563,7 +563,7 @@ that is being reset."
(magit-reset-hard to)
(when (and set-upstream (magit-branch-p to))
(magit-set-branch*merge/remote branch to)))
(magit-branch branch to args)))
(magit-branch-create branch to args)))
;;;###autoload
(defun magit-branch-delete (branches &optional force)
......
......@@ -33,6 +33,7 @@
(define-obsolete-function-alias 'magit-reset-head 'magit-reset-mixed "Magit 2.90.0")
(define-obsolete-function-alias 'magit-gitignore 'magit-gitignore-globally "Magit 2.90.0")
(define-obsolete-function-alias 'magit-branch 'magit-branch-create "Magit 2.90.0")
;;; _
(provide 'magit-obsolete)
......
......@@ -258,7 +258,7 @@ branch or `HEAD' as the string-point."
(interactive (list (magit-read-stash "Branch stash")
(magit-read-string-ns "Branch name")))
(let ((inhibit-magit-refresh t))
(magit-branch branch (or (magit-get-current-branch) "HEAD")))
(magit-branch-create branch (or (magit-get-current-branch) "HEAD")))
(magit-stash-apply stash))
;;;###autoload
......
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