Upgrade packages
This commit is contained in:
parent
85fc3b1c50
commit
da40bc3455
116 changed files with 370 additions and 156 deletions
|
@ -736,6 +736,14 @@
|
||||||
(:authors
|
(:authors
|
||||||
("Thomas Fitzsimmons" . "fitzsim@fitzsim.org"))
|
("Thomas Fitzsimmons" . "fitzsim@fitzsim.org"))
|
||||||
(:keywords "calendar"))])
|
(:keywords "calendar"))])
|
||||||
|
(expand-region .
|
||||||
|
[(0 11 0)
|
||||||
|
nil "Increase selected region by semantic units." tar
|
||||||
|
((:url . "https://github.com/magnars/expand-region.el")
|
||||||
|
(:maintainer "Magnar Sveen" . "magnars@gmail.com")
|
||||||
|
(:authors
|
||||||
|
("Magnar Sveen" . "magnars@gmail.com"))
|
||||||
|
(:keywords "marking" "region"))])
|
||||||
(exwm .
|
(exwm .
|
||||||
[(0 23)
|
[(0 23)
|
||||||
((xelb
|
((xelb
|
||||||
|
@ -1517,7 +1525,7 @@
|
||||||
("Phillip Lord" . "phillip.lord@russet.org.uk"))
|
("Phillip Lord" . "phillip.lord@russet.org.uk"))
|
||||||
(:url . "http://elpa.gnu.org/packages/persist.html"))])
|
(:url . "http://elpa.gnu.org/packages/persist.html"))])
|
||||||
(phps-mode .
|
(phps-mode .
|
||||||
[(0 3 37)
|
[(0 3 38)
|
||||||
((emacs
|
((emacs
|
||||||
(26)))
|
(26)))
|
||||||
"Major mode for PHP with Semantic integration" tar
|
"Major mode for PHP with Semantic integration" tar
|
||||||
|
@ -2012,7 +2020,7 @@
|
||||||
("Oleh Krehel" . "ohwoeowho@gmail.com"))
|
("Oleh Krehel" . "ohwoeowho@gmail.com"))
|
||||||
(:keywords "convenience"))])
|
(:keywords "convenience"))])
|
||||||
(tramp .
|
(tramp .
|
||||||
[(2 4 3 1)
|
[(2 4 3 2)
|
||||||
((emacs
|
((emacs
|
||||||
(24 4)))
|
(24 4)))
|
||||||
"Transparent Remote Access, Multiple Protocol" tar
|
"Transparent Remote Access, Multiple Protocol" tar
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
Good signature from 066DAFCB81E42C40 GNU ELPA Signing Agent (2019) <elpasign@elpa.gnu.org> (trust undefined) created at 2020-02-25T11:05:02+0100 using RSA
|
Good signature from 066DAFCB81E42C40 GNU ELPA Signing Agent (2019) <elpasign@elpa.gnu.org> (trust undefined) created at 2020-02-27T11:05:02+0100 using RSA
|
|
@ -450,7 +450,7 @@ the upstream isn't ahead of the current branch) show."
|
||||||
("r" "current" magit-reflog-current)
|
("r" "current" magit-reflog-current)
|
||||||
("O" "other" magit-reflog-other)
|
("O" "other" magit-reflog-other)
|
||||||
("H" "HEAD" magit-reflog-head)]
|
("H" "HEAD" magit-reflog-head)]
|
||||||
[:if-non-nil magit-wip-mode
|
[:if magit--any-wip-mode-enabled-p
|
||||||
:description "Wiplog"
|
:description "Wiplog"
|
||||||
("i" "index" magit-wip-log-index)
|
("i" "index" magit-wip-log-index)
|
||||||
("w" "worktree" magit-wip-log-worktree)]])
|
("w" "worktree" magit-wip-log-worktree)]])
|
Binary file not shown.
|
@ -1,4 +1,4 @@
|
||||||
(define-package "magit" "20200224.2301" "A Git porcelain inside Emacs."
|
(define-package "magit" "20200226.1310" "A Git porcelain inside Emacs."
|
||||||
'((emacs "25.1")
|
'((emacs "25.1")
|
||||||
(async "20180527")
|
(async "20180527")
|
||||||
(dash "20180910")
|
(dash "20180910")
|
|
@ -330,7 +330,8 @@ Type \\[magit-reset] to reset `HEAD' to the commit at point.
|
||||||
(define-transient-command magit-show-refs (&optional transient)
|
(define-transient-command magit-show-refs (&optional transient)
|
||||||
"List and compare references in a dedicated buffer."
|
"List and compare references in a dedicated buffer."
|
||||||
:man-page "git-branch"
|
:man-page "git-branch"
|
||||||
:value 'magit-show-refs-arguments
|
:value (lambda ()
|
||||||
|
(magit-show-refs-arguments magit-prefix-use-buffer-arguments))
|
||||||
["Arguments"
|
["Arguments"
|
||||||
(magit-for-each-ref:--contains)
|
(magit-for-each-ref:--contains)
|
||||||
("=m" "Merged" "--merged=" magit-transient-read-revision)
|
("=m" "Merged" "--merged=" magit-transient-read-revision)
|
||||||
|
@ -350,18 +351,19 @@ Type \\[magit-reset] to reset `HEAD' to the commit at point.
|
||||||
(transient-setup 'magit-show-refs)
|
(transient-setup 'magit-show-refs)
|
||||||
(magit-refs-setup-buffer "HEAD" (magit-show-refs-arguments))))
|
(magit-refs-setup-buffer "HEAD" (magit-show-refs-arguments))))
|
||||||
|
|
||||||
(defun magit-show-refs-arguments ()
|
(defun magit-show-refs-arguments (&optional use-buffer-args)
|
||||||
|
(unless use-buffer-args
|
||||||
|
(setq use-buffer-args magit-direct-use-buffer-arguments))
|
||||||
(let (args)
|
(let (args)
|
||||||
(cond
|
(cond
|
||||||
((eq current-transient-command 'magit-show-refs)
|
((eq current-transient-command 'magit-show-refs)
|
||||||
(setq args (transient-args 'magit-show-refs)))
|
(setq args (transient-args 'magit-show-refs)))
|
||||||
((eq major-mode 'magit-refs-mode)
|
((eq major-mode 'magit-refs-mode)
|
||||||
(setq args magit-buffer-arguments))
|
(setq args magit-buffer-arguments))
|
||||||
((and (memq magit-prefix-use-buffer-arguments '(always selected))
|
((and (memq use-buffer-args '(always selected))
|
||||||
(when-let ((buffer (magit-get-mode-buffer
|
(when-let ((buffer (magit-get-mode-buffer
|
||||||
'magit-refs-mode nil
|
'magit-refs-mode nil
|
||||||
(eq magit-prefix-use-buffer-arguments
|
(eq use-buffer-args 'selected))))
|
||||||
'selected))))
|
|
||||||
(setq args (buffer-local-value 'magit-buffer-arguments buffer))
|
(setq args (buffer-local-value 'magit-buffer-arguments buffer))
|
||||||
t)))
|
t)))
|
||||||
(t
|
(t
|
Binary file not shown.
|
@ -507,6 +507,7 @@ This discards all changes made since the sequence started."
|
||||||
("-A" "Autostash" "--autostash")
|
("-A" "Autostash" "--autostash")
|
||||||
("-i" "Interactive" ("-i" "--interactive"))
|
("-i" "Interactive" ("-i" "--interactive"))
|
||||||
("-h" "Disable hooks" "--no-verify")
|
("-h" "Disable hooks" "--no-verify")
|
||||||
|
(7 magit-rebase:--exec)
|
||||||
(5 magit:--gpg-sign)
|
(5 magit:--gpg-sign)
|
||||||
(5 "-r" "Rebase merges" "--rebase-merges=" magit-rebase-merges-select-mode)]
|
(5 "-r" "Rebase merges" "--rebase-merges=" magit-rebase-merges-select-mode)]
|
||||||
[:if-not magit-rebase-in-progress-p
|
[:if-not magit-rebase-in-progress-p
|
||||||
|
@ -533,6 +534,13 @@ This discards all changes made since the sequence started."
|
||||||
("e" "Edit" magit-rebase-edit)
|
("e" "Edit" magit-rebase-edit)
|
||||||
("a" "Abort" magit-rebase-abort)])
|
("a" "Abort" magit-rebase-abort)])
|
||||||
|
|
||||||
|
(define-infix-argument magit-rebase:--exec ()
|
||||||
|
:description "Run command after commits"
|
||||||
|
:class 'transient-option
|
||||||
|
:shortarg "-x"
|
||||||
|
:argument "--exec="
|
||||||
|
:reader #'read-shell-command)
|
||||||
|
|
||||||
(defun magit-rebase-merges-select-mode (&rest _ignore)
|
(defun magit-rebase-merges-select-mode (&rest _ignore)
|
||||||
(magit-read-char-case nil t
|
(magit-read-char-case nil t
|
||||||
(?n "[n]o-rebase-cousins" "no-rebase-cousins")
|
(?n "[n]o-rebase-cousins" "no-rebase-cousins")
|
Binary file not shown.
|
@ -227,6 +227,14 @@ command which is about to be called are committed."
|
||||||
(add-hook 'before-save-hook 'magit-wip-commit-initial-backup)
|
(add-hook 'before-save-hook 'magit-wip-commit-initial-backup)
|
||||||
(remove-hook 'before-save-hook 'magit-wip-commit-initial-backup)))
|
(remove-hook 'before-save-hook 'magit-wip-commit-initial-backup)))
|
||||||
|
|
||||||
|
(defun magit--any-wip-mode-enabled-p ()
|
||||||
|
"Return non-nil if any global wip mode is enabled."
|
||||||
|
(or magit-wip-mode
|
||||||
|
magit-wip-after-save-mode
|
||||||
|
magit-wip-after-apply-mode
|
||||||
|
magit-wip-before-change-mode
|
||||||
|
magit-wip-initial-backup-mode))
|
||||||
|
|
||||||
(defvar-local magit-wip-buffer-backed-up nil)
|
(defvar-local magit-wip-buffer-backed-up nil)
|
||||||
(put 'magit-wip-buffer-backed-up 'permanent-local t)
|
(put 'magit-wip-buffer-backed-up 'permanent-local t)
|
||||||
|
|
Binary file not shown.
|
@ -144,46 +144,46 @@ Node: Per-Repository Configuration322787
|
||||||
Node: Essential Settings325042
|
Node: Essential Settings325042
|
||||||
Node: Safety325366
|
Node: Safety325366
|
||||||
Node: Performance327127
|
Node: Performance327127
|
||||||
Node: Microsoft Windows Performance334188
|
Node: Microsoft Windows Performance334765
|
||||||
Node: MacOS Performance335379
|
Node: MacOS Performance335956
|
||||||
Ref: MacOS Performance-Footnote-1336084
|
Ref: MacOS Performance-Footnote-1336661
|
||||||
Node: Plumbing336166
|
Node: Plumbing336743
|
||||||
Node: Calling Git336995
|
Node: Calling Git337572
|
||||||
Node: Getting a Value from Git338520
|
Node: Getting a Value from Git339097
|
||||||
Node: Calling Git for Effect341606
|
Node: Calling Git for Effect342183
|
||||||
Node: Section Plumbing348126
|
Node: Section Plumbing348703
|
||||||
Node: Creating Sections348354
|
Node: Creating Sections348931
|
||||||
Node: Section Selection352254
|
Node: Section Selection352831
|
||||||
Node: Matching Sections354053
|
Node: Matching Sections354630
|
||||||
Node: Refreshing Buffers360026
|
Node: Refreshing Buffers360603
|
||||||
Node: Conventions363174
|
Node: Conventions363751
|
||||||
Node: Theming Faces363366
|
Node: Theming Faces363943
|
||||||
Node: FAQ371481
|
Node: FAQ372058
|
||||||
Node: FAQ - How to ...?371923
|
Node: FAQ - How to ...?372500
|
||||||
Node: How to show git's output?372283
|
Node: How to show git's output?372860
|
||||||
Node: How to install the gitman info manual?373037
|
Node: How to install the gitman info manual?373614
|
||||||
Node: How to show diffs for gpg-encrypted files?374007
|
Node: How to show diffs for gpg-encrypted files?374584
|
||||||
Node: How does branching and pushing work?374603
|
Node: How does branching and pushing work?375180
|
||||||
Node: Can Magit be used as ediff-version-control-package?374966
|
Node: Can Magit be used as ediff-version-control-package?375543
|
||||||
Node: FAQ - Issues and Errors376955
|
Node: FAQ - Issues and Errors377532
|
||||||
Node: Magit is slow377887
|
Node: Magit is slow378464
|
||||||
Node: I changed several thousand files at once and now Magit is unusable378101
|
Node: I changed several thousand files at once and now Magit is unusable378678
|
||||||
Node: I am having problems committing378830
|
Node: I am having problems committing379407
|
||||||
Node: I am using MS Windows and cannot push with Magit379311
|
Node: I am using MS Windows and cannot push with Magit379888
|
||||||
Node: I am using OS X and SOMETHING works in shell but not in Magit379928
|
Node: I am using OS X and SOMETHING works in shell but not in Magit380505
|
||||||
Node: Diffs contain control sequences380734
|
Node: Diffs contain control sequences381311
|
||||||
Node: Expanding a file to show the diff causes it to disappear381847
|
Node: Expanding a file to show the diff causes it to disappear382424
|
||||||
Node: Point is wrong in the COMMIT_EDITMSG buffer382398
|
Node: Point is wrong in the COMMIT_EDITMSG buffer382975
|
||||||
Node: The mode-line information isn't always up-to-date383444
|
Node: The mode-line information isn't always up-to-date384021
|
||||||
Node: A branch and tag sharing the same name breaks SOMETHING384526
|
Node: A branch and tag sharing the same name breaks SOMETHING385103
|
||||||
Node: My Git hooks work on the command-line but not inside Magit385414
|
Node: My Git hooks work on the command-line but not inside Magit385991
|
||||||
Node: git-commit-mode isn't used when committing from the command-line386260
|
Node: git-commit-mode isn't used when committing from the command-line386837
|
||||||
Node: Point ends up inside invisible text when jumping to a file-visiting buffer388527
|
Node: Point ends up inside invisible text when jumping to a file-visiting buffer389104
|
||||||
Node: Debugging Tools389325
|
Node: Debugging Tools389902
|
||||||
Node: Keystroke Index391504
|
Node: Keystroke Index392081
|
||||||
Node: Command Index425488
|
Node: Command Index426065
|
||||||
Node: Function Index462513
|
Node: Function Index463090
|
||||||
Node: Variable Index478865
|
Node: Variable Index479442
|
||||||
|
|
||||||
End Tag Table
|
End Tag Table
|
||||||
|
|
|
@ -31,7 +31,7 @@ to perform almost all of their daily version control tasks directly from
|
||||||
within Emacs. While many fine Git clients exist, only Magit and Git
|
within Emacs. While many fine Git clients exist, only Magit and Git
|
||||||
itself deserve to be called porcelains.
|
itself deserve to be called porcelains.
|
||||||
|
|
||||||
This manual is for Magit version 2.90.1 (v2.90.1-900-g14c70a5ac+1).
|
This manual is for Magit version 2.90.1 (v2.90.1-930-ge3b4ed55e+1).
|
||||||
|
|
||||||
Copyright (C) 2015-2020 Jonas Bernoulli <jonas@bernoul.li>
|
Copyright (C) 2015-2020 Jonas Bernoulli <jonas@bernoul.li>
|
||||||
|
|
|
@ -770,6 +770,15 @@ using ‘magit-revision-mode’ takes considerably more time than looking at
|
||||||
the same commit in ‘magit-diff-mode’, then consider setting
|
the same commit in ‘magit-diff-mode’, then consider setting
|
||||||
‘magit-revision-insert-related-refs’ to ‘nil’.
|
‘magit-revision-insert-related-refs’ to ‘nil’.
|
||||||
|
|
||||||
|
When you are often confronted with diffs that contain deleted files,
|
||||||
|
then you might want to enable the ‘--irreversible-delete’ argument. If
|
||||||
|
you do that then diffs still show that a file was deleted but without
|
||||||
|
also showing the complete deleted content of the file. This argument is
|
||||||
|
not available by default, see *note (transient)Enabling and Disabling
|
||||||
|
Suffixes::. Once you have done that you should enable it and save that
|
||||||
|
setting, see *note (transient)Saving Values::. You should do this in
|
||||||
|
both the diff (‘d’) and the diff refresh (‘D’) transient popups.
|
||||||
|
|
||||||
Refs Buffer Performance
|
Refs Buffer Performance
|
||||||
.......................
|
.......................
|
||||||
|
|
Some files were not shown because too many files have changed in this diff Show more
Loading…
Add table
Reference in a new issue