Commit 00c501fe authored by Jonas Bernoulli's avatar Jonas Bernoulli

Merge branch 'rename' [#3619]

parents 21f786a1 81d38b7b
......@@ -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-293-g50e05e4ac+1)
#+SUBTITLE: for version 2.13.0 (2.13.0-308-g728052be4+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-293-g50e05e4ac+1).
This manual is for Magit version 2.13.0 (2.13.0-308-g728052be4+1).
#+BEGIN_QUOTE
Copyright (C) 2015-2018 Jonas Bernoulli <jonas@bernoul.li>
......@@ -3463,7 +3463,7 @@ blob-visiting buffers. You can also enter the blame popup from the
file popup, which is available on ~C-c M-g~, provided ~magit-file-mode~
is enabled, see [[*Minor Mode for Buffers Visiting Files]].
- Command: magit-blame
- Command: magit-blame-addition
This command augments each line or chunk of lines in the current
file- or blob-visiting buffer with information about what commits
......@@ -3480,9 +3480,9 @@ is enabled, see [[*Minor Mode for Buffers Visiting Files]].
- Command: magit-blame-echo
This command is like ~magit-blame~ except that it doesn't turn on
~read-only-mode~ and that it initially uses the visualization style
specified by option ~magit-blame-echo-style~.
This command is like ~magit-blame-addition~ except that it doesn't
turn on ~read-only-mode~ and that it initially uses the visualization
style specified by option ~magit-blame-echo-style~.
- Command: magit-blame-removal
......@@ -3490,7 +3490,7 @@ is enabled, see [[*Minor Mode for Buffers Visiting Files]].
blob-visiting buffer with information about the revision that
removes it. It cannot be used in file-visiting buffers.
Like ~magit-blame~, this command can be used recursively.
Like ~magit-blame-addition~, this command can be used recursively.
- Command: magit-blame-reverse
......@@ -3498,7 +3498,7 @@ is enabled, see [[*Minor Mode for Buffers Visiting Files]].
file- or blob-visiting buffer with information about the last
revision in which a line still existed.
Like ~magit-blame~, this command can be used recursively.
Like ~magit-blame-addition~, this command can be used recursively.
The following key bindings are available when Magit-Blame mode is
enabled and Read-Only mode is not enabled. These commands are also
......@@ -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
......@@ -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
......@@ -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
......@@ -5403,7 +5403,7 @@ features these commands instead.
When no cherry-pick or revert is in progress, then the popup buffer
features the following commands.
- Key: V V, magit-revert
- Key: V V, magit-revert-and-commit
Revert a commit by creating a new commit. Prompt for a commit,
defaulting to the commit at point. If the region selects multiple
......@@ -5436,13 +5436,14 @@ features these commands instead.
Also see [[man:git-reset]]
- Key: x, magit-reset
- Key: x, magit-reset-quickly
Reset the head and index to some commit read from the user and
defaulting to the commit at point. The working tree is kept as-is.
With a prefix argument also reset the working tree.
Reset the ~HEAD~ and index to some commit read from the user and
defaulting to the commit at point, and possibly also reset the
working tree. With a prefix argument reset the working tree
otherwise don't.
- Key: X m, magit-reset-head
- Key: X m, magit-reset-mixed
Reset the ~HEAD~ and index to some commit read from the user and
defaulting to the commit at point. The working tree is kept as-is.
......@@ -5484,7 +5485,7 @@ Also see [[man:git-stash]]
This prefix command shows the following suffix commands along with
the appropriate infix arguments in a popup buffer.
- Key: z z, magit-stash
- Key: z z, magit-stash-both
Create a stash of the index and working tree. Untracked files are
included according to popup arguments. One prefix argument is
......@@ -5510,7 +5511,7 @@ Also see [[man:git-stash]]
prefix argument is equivalent to ~--include-untracked~ while two
prefix arguments are equivalent to ~--all~.
- Key: z Z, magit-snapshot
- Key: z Z, magit-snapshot-both
Create a snapshot of the index and working tree. Untracked files
are included according to popup arguments. One prefix argument is
......@@ -5742,7 +5743,7 @@ Also see [[man:git-fetch]]
Fetch from the upstream of the current branch.
- Key: f e, magit-fetch
- Key: f e, magit-fetch-other
Fetch from another repository.
......@@ -5789,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.
......@@ -5989,7 +5990,7 @@ Also see [[man:git-tag]]
This prefix command shows the following suffix commands along with
the appropriate infix arguments in a popup buffer.
- Key: t t, magit-tag
- Key: t t, magit-tag-create
Create a new tag with the given NAME at REV. With a prefix argument
annotate the tag.
......@@ -6582,7 +6583,7 @@ few key bindings, but this might be extended in the future.
This prefix command shows all blaming suffix command along with the
appropriate infix arguments in a popup buffer. See [[*Blaming]].
- Key: C-c M-g b, magit-blame
- Key: C-c M-g b, magit-blame-addition
This command shows for each line the revision in which it was added.
......
......@@ -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-293-g50e05e4ac+1)
@subtitle for version 2.13.0 (2.13.0-308-g728052be4+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-293-g50e05e4ac+1).
This manual is for Magit version 2.13.0 (2.13.0-308-g728052be4+1).
@quotation
Copyright (C) 2015-2018 Jonas Bernoulli <jonas@@bernoul.li>
......@@ -4710,8 +4710,8 @@ blob-visiting buffers. You can also enter the blame popup from the
file popup, which is available on @code{C-c M-g}, provided @code{magit-file-mode}
is enabled, see @ref{Minor Mode for Buffers Visiting Files}.
@cindex magit-blame
@deffn Command magit-blame
@cindex magit-blame-addition
@deffn Command magit-blame-addition
This command augments each line or chunk of lines in the current
file- or blob-visiting buffer with information about what commits
......@@ -4730,9 +4730,9 @@ added the current line or chunk of lines.
@cindex magit-blame-echo
@deffn Command magit-blame-echo
This command is like @code{magit-blame} except that it doesn't turn on
@code{read-only-mode} and that it initially uses the visualization style
specified by option @code{magit-blame-echo-style}.
This command is like @code{magit-blame-addition} except that it doesn't
turn on @code{read-only-mode} and that it initially uses the visualization
style specified by option @code{magit-blame-echo-style}.
@end deffn
@cindex magit-blame-removal
......@@ -4742,7 +4742,7 @@ This command augments each line or chunk of lines in the current
blob-visiting buffer with information about the revision that
removes it. It cannot be used in file-visiting buffers.
Like @code{magit-blame}, this command can be used recursively.
Like @code{magit-blame-addition}, this command can be used recursively.
@end deffn
@cindex magit-blame-reverse
......@@ -4752,7 +4752,7 @@ This command augments each line or chunk of lines in the current
file- or blob-visiting buffer with information about the last
revision in which a line still existed.
Like @code{magit-blame}, this command can be used recursively.
Like @code{magit-blame-addition}, this command can be used recursively.
@end deffn
The following key bindings are available when Magit-Blame mode is
......@@ -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
......@@ -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
......@@ -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
......@@ -7268,8 +7268,8 @@ features the following commands.
@table @asis
@kindex V V
@cindex magit-revert
@item @kbd{V V} @tie{}@tie{}@tie{}@tie{}(@code{magit-revert})
@cindex magit-revert-and-commit
@item @kbd{V V} @tie{}@tie{}@tie{}@tie{}(@code{magit-revert-and-commit})
Revert a commit by creating a new commit. Prompt for a commit,
defaulting to the commit at point. If the region selects multiple
......@@ -7327,16 +7327,17 @@ the git-reset(1) manpage.
@table @asis
@kindex x
@cindex magit-reset
@item @kbd{x} @tie{}@tie{}@tie{}@tie{}(@code{magit-reset})
@cindex magit-reset-quickly
@item @kbd{x} @tie{}@tie{}@tie{}@tie{}(@code{magit-reset-quickly})
Reset the head and index to some commit read from the user and
defaulting to the commit at point. The working tree is kept as-is.
With a prefix argument also reset the working tree.
Reset the @code{HEAD} and index to some commit read from the user and
defaulting to the commit at point, and possibly also reset the
working tree. With a prefix argument reset the working tree
otherwise don't.
@kindex X m
@cindex magit-reset-head
@item @kbd{X m} @tie{}@tie{}@tie{}@tie{}(@code{magit-reset-head})
@cindex magit-reset-mixed
@item @kbd{X m} @tie{}@tie{}@tie{}@tie{}(@code{magit-reset-mixed})
Reset the @code{HEAD} and index to some commit read from the user and
defaulting to the commit at point. The working tree is kept as-is.
......@@ -7405,8 +7406,8 @@ This prefix command shows the following suffix commands along with
the appropriate infix arguments in a popup buffer.
@kindex z z
@cindex magit-stash
@item @kbd{z z} @tie{}@tie{}@tie{}@tie{}(@code{magit-stash})
@cindex magit-stash-both
@item @kbd{z z} @tie{}@tie{}@tie{}@tie{}(@code{magit-stash-both})
Create a stash of the index and working tree. Untracked files are
included according to popup arguments. One prefix argument is
......@@ -7439,8 +7440,8 @@ prefix argument is equivalent to @code{--include-untracked} while two
prefix arguments are equivalent to @code{--all}.
@kindex z Z
@cindex magit-snapshot
@item @kbd{z Z} @tie{}@tie{}@tie{}@tie{}(@code{magit-snapshot})
@cindex magit-snapshot-both
@item @kbd{z Z} @tie{}@tie{}@tie{}@tie{}(@code{magit-snapshot-both})
Create a snapshot of the index and working tree. Untracked files
are included according to popup arguments. One prefix argument is
......@@ -7790,8 +7791,8 @@ Fetch from the push-remote of the current branch.
Fetch from the upstream of the current branch.
@kindex f e
@cindex magit-fetch
@item @kbd{f e} @tie{}@tie{}@tie{}@tie{}(@code{magit-fetch})
@cindex magit-fetch-other
@item @kbd{f e} @tie{}@tie{}@tie{}@tie{}(@code{magit-fetch-other})
Fetch from another repository.
......@@ -7867,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
......@@ -8191,8 +8192,8 @@ This prefix command shows the following suffix commands along with
the appropriate infix arguments in a popup buffer.
@kindex t t
@cindex magit-tag
@item @kbd{t t} @tie{}@tie{}@tie{}@tie{}(@code{magit-tag})
@cindex magit-tag-create
@item @kbd{t t} @tie{}@tie{}@tie{}@tie{}(@code{magit-tag-create})
Create a new tag with the given NAME at REV@. With a prefix argument
annotate the tag.
......@@ -8989,8 +8990,8 @@ This prefix command shows all blaming suffix command along with the
appropriate infix arguments in a popup buffer. See @ref{Blaming}.
@kindex C-c M-g b
@cindex magit-blame
@item @kbd{C-c M-g b} @tie{}@tie{}@tie{}@tie{}(@code{magit-blame})
@cindex magit-blame-addition
@item @kbd{C-c M-g b} @tie{}@tie{}@tie{}@tie{}(@code{magit-blame-addition})
This command shows for each line the revision in which it was added.
......
......@@ -267,7 +267,7 @@ in `magit-blame-read-only-mode-map' instead.")
(define-key map (kbd "I") 'magit-blame-previous-chunk-same-commit)
(define-key map (kbd "k") 'magit-blame-next-chunk)
(define-key map (kbd "K") 'magit-blame-next-chunk-same-commit)
(define-key map (kbd "j") 'magit-blame)
(define-key map (kbd "j") 'magit-blame-addition)
(define-key map (kbd "l") 'magit-blame-removal)
(define-key map (kbd "f") 'magit-blame-reverse)
(define-key map (kbd "b") 'magit-blame-popup))
......@@ -277,7 +277,7 @@ in `magit-blame-read-only-mode-map' instead.")
(define-key map (kbd "P") 'magit-blame-previous-chunk-same-commit)
(define-key map (kbd "n") 'magit-blame-next-chunk)
(define-key map (kbd "N") 'magit-blame-next-chunk-same-commit)
(define-key map (kbd "b") 'magit-blame)
(define-key map (kbd "b") 'magit-blame-addition)
(define-key map (kbd "r") 'magit-blame-removal)
(define-key map (kbd "f") 'magit-blame-reverse)
(define-key map (kbd "B") 'magit-blame-popup)))
......@@ -720,12 +720,12 @@ not turn on `read-only-mode'."
(cons 'eldoc-mode magit-blame-disable-modes))
(if (not magit-blame-mode)
(let ((magit-blame-read-only nil))
(magit-blame))
(magit-blame-addition))
(read-only-mode -1)
(magit-blame--update-overlays)))
;;;###autoload
(defun magit-blame ()
(defun magit-blame-addition ()
"For each line show the revision in which it was added."
(interactive)
(magit-blame--pre-blame-assert 'addition)
......@@ -882,7 +882,7 @@ instead of the hash, like `kill-ring-save' would."
:options '((?M "Detect lines moved or copied within a file" "-M")
(?C "Detect lines moved or copied between files" "-C"))
:actions '("Actions"
(?b "Show commits adding lines" magit-blame)
(?b "Show commits adding lines" magit-blame-addition)
(?r (lambda ()
(with-current-buffer magit-pre-popup-buffer
(and (not buffer-file-name)
......@@ -902,7 +902,7 @@ instead of the hash, like `kill-ring-save' would."
(?c "Cycle style" magit-blame-cycle-style))
:default-arguments '("-w")
:max-action-columns 1
:default-action 'magit-blame)
:default-action 'magit-blame-addition)
;;; Utilities
......
......@@ -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)
......
......@@ -245,15 +245,22 @@ with two prefix arguments remove ignored files only.
"Popup console for gitignore commands."
:man-page "gitignore"
:actions '((?l "ignore locally" magit-gitignore-locally)
(?g "ignore globally" magit-gitignore))
(?g "ignore globally" magit-gitignore-globally))
:max-action-columns 1)
;;;###autoload
(defun magit-gitignore (file-or-pattern &optional local)
"Instruct Git to ignore FILE-OR-PATTERN.
With a prefix argument only ignore locally."
(interactive (list (magit-gitignore-read-pattern current-prefix-arg)
current-prefix-arg))
(defun magit-gitignore-globally (file-or-pattern)
"Instruct Git to globally ignore FILE-OR-PATTERN."
(interactive (list (magit-gitignore-read-pattern nil)))
(magit--gitignore file-or-pattern nil))
;;;###autoload
(defun magit-gitignore-locally (file-or-pattern)
"Instruct Git to locally ignore FILE-OR-PATTERN."
(interactive (list (magit-gitignore-read-pattern t)))
(magit--gitignore file-or-pattern t))
(defun magit--gitignore (file-or-pattern local)
(let ((gitignore
(if local
(magit-git-dir (convert-standard-filename "info/exclude"))
......@@ -272,12 +279,6 @@ With a prefix argument only ignore locally."
(magit-refresh)
(magit-run-git "add" ".gitignore"))))
;;;###autoload
(defun magit-gitignore-locally (file-or-pattern)
"Instruct Git to locally ignore FILE-OR-PATTERN."
(interactive (list (magit-gitignore-read-pattern t)))
(magit-gitignore file-or-pattern t))
(defun magit-gitignore-read-pattern (local)
(let* ((default (magit-current-file))
(choices
......
......@@ -233,7 +233,7 @@ directory, while reading the FILENAME."
(?u "Unstage" magit-unstage-file)
(?d "Diff" magit-diff-buffer-file)
(?l "Log" magit-log-buffer-file)
(?b "Blame" magit-blame)
(?b "Blame" magit-blame-addition)
(?p "Prev blob" magit-blob-previous)
(?c "Commit" magit-commit-popup) nil
(?t "Trace" magit-log-trace-definition)
......@@ -292,13 +292,13 @@ Currently this only adds the following key bindings.
(cond ((featurep 'jkl)
(define-key map "i" 'magit-blob-previous)
(define-key map "k" 'magit-blob-next)
(define-key map "j" 'magit-blame)
(define-key map "j" 'magit-blame-addition)
(define-key map "l" 'magit-blame-removal)
(define-key map "f" 'magit-blame-reverse))
(t
(define-key map "p" 'magit-blob-previous)
(define-key map "n" 'magit-blob-next)
(define-key map "b" 'magit-blame)
(define-key map "b" 'magit-blame-addition)
(define-key map "r" 'magit-blame-removal)
(define-key map "f" 'magit-blame-reverse)))
(define-key map "q" 'magit-kill-this-buffer)
......
......@@ -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
......
......@@ -390,7 +390,7 @@ starts complicating other things, then it will be removed."
(define-key map (kbd "P") 'magit-push-popup)
(define-key map (kbd "k") 'magit-delete-thing)
(define-key map (kbd "K") 'magit-file-untrack)
(define-key map (kbd "i") 'magit-gitignore)
(define-key map (kbd "i") 'magit-gitignore-popup)
(define-key map (kbd "I") 'magit-gitignore-popup)))
(define-key map (kbd "SPC") 'magit-diff-show-or-scroll-up)
(define-key map (kbd "DEL") 'magit-diff-show-or-scroll-down)
......@@ -441,7 +441,7 @@ starts complicating other things, then it will be removed."
(define-key map "V" 'magit-revert-popup)
(define-key map "w" 'magit-am-popup)
(define-key map "W" 'magit-patch-popup)
(define-key map "x" 'magit-reset)
(define-key map "x" 'magit-reset-quickly)
(define-key map "X" 'magit-reset-popup)
(define-key map "y" 'magit-show-refs-popup)
(define-key map "Y" 'magit-cherry)
......@@ -507,7 +507,7 @@ which visits the thing at point using `browse-url'."
["Reset index" magit-reset-index t]
["Commit" magit-commit-popup t]
["Add log entry" magit-commit-add-log t]
["Tag" magit-tag t]
["Tag" magit-tag-create t]
"---"
["Diff working tree" magit-diff-working-tree t]
["Diff" magit-diff t]
......@@ -519,12 +519,12 @@ which visits the thing at point using `browse-url'."
["Cherry pick" magit-cherry-pick t]
["Revert commit" magit-revert-popup t]
"---"
["Ignore" magit-gitignore t]
["Ignore globally" magit-gitignore-globally t]
["Ignore locally" magit-gitignore-locally t]
["Discard" magit-discard t]
["Reset head" magit-reset-head t]
["Stash" magit-stash t]
["Snapshot" magit-snapshot t]
["Reset head and index" magit-reset-mixed t]
["Stash" magit-stash-both t]
["Snapshot" magit-snapshot-both t]
"---"
["Branch..." magit-checkout t]
["Merge" magit-merge t]
......@@ -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]
......
......@@ -29,5 +29,22 @@
(require 'magit)
;;; Obsolete since v2.90.0
(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")
(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")
(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")
(define-obsolete-function-alias 'magit-stash 'magit-stash-both "Magit 2.90.0")
(define-obsolete-function-alias 'magit-snapshot 'magit-snapshot-both "Magit 2.90.0")
;;; _
(provide 'magit-obsolete)
;;; magit-obsolete.el ends here
......@@ -451,7 +451,7 @@ Delete the symbolic-ref \"refs/remotes/<remote>/HEAD\"."
"Fetch from"
(?p magit-get-push-remote magit-fetch-from-pushremote)
(?u magit-get-remote magit-fetch-from-upstream)
(?e "elsewhere" magit-fetch)
(?e "elsewhere" magit-fetch-other)
(?a "all remotes" magit-fetch-all)
"Fetch"
(?o "another branch" magit-fetch-branch)
......@@ -485,7 +485,7 @@ Delete the symbolic-ref \"refs/remotes/<remote>/HEAD\"."
(user-error "No branch is checked out"))))
;;;###autoload
(defun magit-fetch (remote args)
(defun magit-fetch-other (remote args)
"Fetch from another repository."
(interactive (list (magit-read-remote "Fetch remote")
(magit-fetch-arguments)))
......@@ -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)))
......
......@@ -33,7 +33,7 @@
(magit-define-popup magit-reset-popup
"Popup console for reset commands."
:man-page "git-reset"
:actions '((?m "reset mixed (HEAD and index)" magit-reset-head)
:actions '((?m "reset mixed (HEAD and index)" magit-reset-mixed)
(?s "reset soft (HEAD only)" magit-reset-soft)
(?h "reset hard (HEAD, index, and files)" magit-reset-hard)
(?i "reset index (only)" magit-reset-index)
......@@ -43,20 +43,7 @@
:max-action-columns 1)
;;;###autoload
(defun magit-reset (commit &optional hard)
"Reset the `HEAD' and index to COMMIT, but not the working tree.
With a prefix argument also reset the working tree.
\n(git reset --mixed|--hard COMMIT)"
(interactive (list (magit-reset-read-branch-or-commit
(if current-prefix-arg
(concat (propertize "Hard" 'face 'bold)
" reset %s to")
"Reset %s to"))
current-prefix-arg))
(magit-reset-internal (if hard "--hard" "--mixed") commit))
;;;###autoload
(defun magit-reset-head (commit)
(defun magit-reset-mixed (commit)
"Reset the `HEAD' and index to COMMIT, but not the working tree.
\n(git reset --mixed COMMIT)"
(interactive (list (magit-reset-read-branch-or-commit "Reset %s to")))
......@@ -97,6 +84,19 @@ Keep the `HEAD' and index as-is."
(magit-run-git "checkout-index" "--all" "--force")
(magit-wip-commit-after-apply nil " after reset")))
;;;###autoload
(defun magit-reset-quickly (commit &optional hard)
"Reset the `HEAD' and index to COMMIT, and possibly the working tree.
With a prefix argument reset the working tree otherwise don't.
\n(git reset --mixed|--hard COMMIT)"
(interactive (list (magit-reset-read-branch-or-commit
(if current-prefix-arg
(concat (propertize "Hard" 'face 'bold)
" reset %s to")
"Reset %s to"))
current-prefix-arg))
(magit-reset-internal (if hard "--hard" "--mixed") commit))
(defun magit-reset-read-branch-or-commit (prompt)
"Prompt for and return a ref to reset HEAD to.
......
......@@ -335,7 +335,7 @@ the process manually."
:options '((?s "Strategy" "--strategy=")
(?S "Sign using gpg" "--gpg-sign=" magit-read-gpg-secret-key)
(?m "Replay merge relative to parent" "--mainline="))
:actions '((?V "Revert commit(s)" magit-revert)
:actions '((?V "Revert commit(s)" magit-revert-and-commit)
(?v "Revert changes" magit-revert-no-commit))
:sequence-actions '((?V "Continue" magit-sequencer-continue)
(?s "Skip" magit-sequencer-skip)
......@@ -349,7 +349,7 @@ the process manually."
(magit-revert-arguments)))
;;;###autoload
(defun magit-revert (commit &optional args)
(defun magit-revert-and-commit (commit &optional args)
"Revert COMMIT by creating a new commit.
Prompt for a commit, defaulting to the commit at point. If
the region selects multiple commits, then revert all of them,
......@@ -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."
......
......@@ -87,8 +87,8 @@ AUTHOR-WIDTH has to be an integer. When the name of the author
:man-page "git-stash"
:switches '((?u "Also save untracked files" "--include-untracked")
(?a "Also save untracked and ignored files" "--all"))
:actions '((?z "Save" magit-stash)
(?Z "Snapshot" magit-snapshot)
:actions '((?z "Save" magit-stash-both)
(?Z "Snapshot" magit-snapshot-both)
(?p "Pop" magit-stash-pop)
(?i "Save index" magit-stash-index)
(?I "Snapshot index" magit-snapshot-index)
......@@ -107,7 +107,7 @@ AUTHOR-WIDTH has to be an integer. When the name of the author
:max-action-columns 3)
;;;###autoload
(defun magit-stash (message &optional include-untracked)
(defun magit-stash-both (message &optional include-untracked)
"Create a stash of the index and working tree.
Untracked files are included according to popup arguments.
One prefix argument is equivalent to `--include-untracked'
......@@ -162,7 +162,7 @@ while two prefix arguments are equivalent to `--all'."
input)))
;;;###autoload
(defun magit-snapshot (&optional include-untracked)
(defun magit-snapshot-both (&optional include-untracked)