daniel/emacs
1
2
Fork 0
Code Issues 7 Pull Requests Projects Releases Wiki Activity

update packages

Browse Source
This commit is contained in:
Daniel Weschke
2025-07-05 20:36:47 +02:00
parent 4a4f30e3b1
commit 65dedd3df8
60 changed files with 15454 additions and 342 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lisp/magit/magit-apply.el
View File

@@ -490,10 +490,7 @@ of a side, then keep that side without prompting."
(pcase (list (magit-diff-type) (magit-diff-scope))
(`(committed ,_) (user-error "Cannot discard committed changes"))
(`(undefined ,_) (user-error "Cannot discard this change"))
(`(untracked list) (magit-discard-files--delete
(magit-with-toplevel
(magit-untracked-files nil nil "--directory"))
nil))
(`(untracked list) (magit-discard-untracked))
(`(,_ region) (magit-discard-region s))
(`(,_ hunk) (magit-discard-hunk s))
(`(,_ hunks) (magit-discard-hunks s))
@@ -501,6 +498,12 @@ of a side, then keep that side without prompting."
(`(,_ files) (magit-discard-files s))
(`(,_ list) (magit-discard-files s)))))
(defun magit-discard-untracked ()
(magit-discard-files--delete
(magit-with-toplevel (magit-list-untracked-files))
nil)
(magit-refresh))
(defun magit-discard-region (section)
(magit-confirm 'discard "Discard region")
(magit-discard-apply section 'magit-apply-region))