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

update packages

Browse Source
This commit is contained in:
Daniel Weschke
2026-06-27 11:34:21 +02:00
parent 4be4f859c4
commit 1aaef48596
246 changed files with 7997 additions and 4359 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lisp/magit/magit-stash.el
+22 -17
View File
@@ -124,8 +124,8 @@ AUTHOR-WIDTH has to be an integer. When the name of the author
(defun magit-stash-both (message &optional include-untracked)
"Create a stash of the index and working tree.
Untracked files are included according to infix arguments.
One prefix argument is equivalent to `--include-untracked'
while two prefix arguments are equivalent to `--all'."
One prefix argument is equivalent to \"--include-untracked\"
while two prefix arguments are equivalent to \"--all\"."
(interactive
(progn (when (and (magit-merge-in-progress-p)
(not (magit-y-or-n-p "\
@@ -150,8 +150,8 @@ Applying the resulting stash has the inverse effect."
(defun magit-stash-worktree (message &optional include-untracked)
"Create a stash of unstaged changes in the working tree.
Untracked files are included according to infix arguments.
One prefix argument is equivalent to `--include-untracked'
while two prefix arguments are equivalent to `--all'."
One prefix argument is equivalent to \"--include-untracked\"
while two prefix arguments are equivalent to \"--all\"."
(interactive (magit-stash-read-args))
(magit-stash-save message nil t include-untracked t 'index))
@@ -159,8 +159,8 @@ while two prefix arguments are equivalent to `--all'."
(defun magit-stash-keep-index (message &optional include-untracked)
"Create a stash of the index and working tree, keeping index intact.
Untracked files are included according to infix arguments.
One prefix argument is equivalent to `--include-untracked'
while two prefix arguments are equivalent to `--all'."
One prefix argument is equivalent to \"--include-untracked\"
while two prefix arguments are equivalent to \"--all\"."
(interactive (magit-stash-read-args))
(magit-stash-save message t t include-untracked t 'index))
@@ -206,8 +206,8 @@ The resulting message is what Git would have used."
(defun magit-snapshot-both (&optional include-untracked)
"Create a snapshot of the index and working tree.
Untracked files are included according to infix arguments.
One prefix argument is equivalent to `--include-untracked'
while two prefix arguments are equivalent to `--all'."
One prefix argument is equivalent to \"--include-untracked\"
while two prefix arguments are equivalent to \"--all\"."
(interactive (magit-snapshot-read-args))
(magit-snapshot-save t t include-untracked t))
@@ -222,8 +222,8 @@ Unstaged and untracked changes are not stashed."
(defun magit-snapshot-worktree (&optional include-untracked)
"Create a snapshot of unstaged changes in the working tree.
Untracked files are included according to infix arguments.
One prefix argument is equivalent to `--include-untracked'
while two prefix arguments are equivalent to `--all'."
One prefix argument is equivalent to \"--include-untracked\"
while two prefix arguments are equivalent to \"--all\"."
(interactive (magit-snapshot-read-args))
(magit-snapshot-save nil t include-untracked t))
@@ -320,10 +320,11 @@ want to fall back to using \"--3way\", without being prompted."
(magit--run-git-stash "apply" stash)
(let* ((range (format "%s^..%s" stash stash))
(stashed (magit-git-items "diff" "-z" "--name-only" range "--"))
(conflicts (cl-sort (cl-union (magit-unstaged-files t stashed)
(magit-untracked-files t stashed)
:test #'equal)
#'string<))
(conflicts (compat-call
sort (cl-union (magit-unstaged-files t stashed)
(magit-untracked-files t stashed)
:test #'equal)
:lessp #'string<))
(arg (if (or (not conflicts)
(memq 'stash-apply-3way magit-no-confirm))
"--3way"
@@ -685,11 +686,15 @@ that make up the stash."
;; Local Variables:
;; read-symbol-shorthands: (
;; ("and$" . "cond-let--and$")
;; ("and>" . "cond-let--and>")
;; ("and-let" . "cond-let--and-let")
;; ("if-let" . "cond-let--if-let")
;; ("thread$" . "cond-let--thread$")
;; ("when$" . "cond-let--when$")
;; ("and-let*" . "cond-let--and-let*")
;; ("and-let" . "cond-let--and-let")
;; ("if-let*" . "cond-let--if-let*")
;; ("if-let" . "cond-let--if-let")
;; ("when-let*" . "cond-let--when-let*")
;; ("when-let" . "cond-let--when-let")
;; ("while-let*" . "cond-let--while-let*")
;; ("while-let" . "cond-let--while-let")
;; ("match-string" . "match-string")
;; ("match-str" . "match-string-no-properties"))