diff --git a/lisp/dashboard/dashboard-pkg.el b/lisp/dashboard/dashboard-pkg.el
index bf3703b1..805b67c9 100644
--- a/lisp/dashboard/dashboard-pkg.el
+++ b/lisp/dashboard/dashboard-pkg.el
@@ -1,10 +1,10 @@
 ;; -*- no-byte-compile: t; lexical-binding: nil -*-
-(define-package "dashboard" "20250521.900"
+(define-package "dashboard" "20250708.57"
   "A startup screen extracted from Spacemacs."
   '((emacs "27.1"))
   :url "https://github.com/emacs-dashboard/emacs-dashboard"
-  :commit "f07661b39bec3683cf9edb7b1c58f6e658b6f764"
-  :revdesc "f07661b39bec"
+  :commit "8c2cf0cfde4f5dac8c477f755380fffef6824108"
+  :revdesc "8c2cf0cfde4f"
   :keywords '("startup" "screen" "tools" "dashboard")
   :authors '(("Rakan Al-Hneiti" . "rakan.alhneiti@gmail.com"))
   :maintainers '(("Jen-Chieh" . "jcs090218@gmail.com")
diff --git a/lisp/dashboard/dashboard-widgets.el b/lisp/dashboard/dashboard-widgets.el
index b25e78e8..6d341055 100644
--- a/lisp/dashboard/dashboard-widgets.el
+++ b/lisp/dashboard/dashboard-widgets.el
@@ -798,25 +798,20 @@ Argument IMAGE-PATH path to the image."
   (goto-char (point-max))
   (when-let* ((banner (dashboard-choose-banner dashboard-startup-banner)))
     (insert "\n")
+    (when (display-graphic-p) (insert "\n"))
     (let ((start (point))
           buffer-read-only
           text-width
-          image-spec
-          (graphic-mode (display-graphic-p)))
-      (when graphic-mode (insert "\n"))
+          image-spec)
       ;; If specified, insert a text banner.
       (when-let* ((txt (plist-get banner :text)))
-        (if (file-exists-p txt)
-            (insert-file-contents txt)
-          (save-excursion (insert txt)))
-        (unless (text-properties-at 0 txt)
-          (put-text-property (point) (point-max) 'face 'dashboard-text-banner))
-        (setq text-width 0)
-        (while (not (eobp))
-          (let ((line-length (- (line-end-position) (line-beginning-position))))
-            (when (< text-width line-length)
-              (setq text-width line-length)))
-          (forward-line 1)))
+        (save-excursion
+          (if (file-exists-p txt)
+              (insert-file-contents txt)
+            (insert txt)))
+        (put-text-property start (point-max) 'face 'dashboard-text-banner)
+        (setq text-width (dashboard--find-max-width start (point-max)))
+        (goto-char (point-max)))
       ;; If specified, insert an image banner. When displayed in a graphical frame, this will
       ;; replace the text banner.
       (when-let* ((img (plist-get banner :image)))
diff --git a/lisp/dashboard/dashboard.el b/lisp/dashboard/dashboard.el
index 5cbd7a77..d735afcd 100644
--- a/lisp/dashboard/dashboard.el
+++ b/lisp/dashboard/dashboard.el
@@ -12,8 +12,8 @@
 ;;; License: GPLv3
 ;;
 ;; Created: October 05, 2016
-;; Package-Version: 20250521.900
-;; Package-Revision: f07661b39bec
+;; Package-Version: 20250708.57
+;; Package-Revision: 8c2cf0cfde4f
 ;; Keywords: startup, screen, tools, dashboard
 ;; Package-Requires: ((emacs "27.1"))
 
diff --git a/lisp/diff-hl/diff-hl-pkg.el b/lisp/diff-hl/diff-hl-pkg.el
index 40c821da..10f2de1f 100644
--- a/lisp/diff-hl/diff-hl-pkg.el
+++ b/lisp/diff-hl/diff-hl-pkg.el
@@ -1,11 +1,11 @@
 ;; -*- no-byte-compile: t; lexical-binding: nil -*-
-(define-package "diff-hl" "20250613.2144"
+(define-package "diff-hl" "20250710.145"
   "Highlight uncommitted changes using VC."
   '((cl-lib "0.2")
     (emacs  "26.1"))
   :url "https://github.com/dgutov/diff-hl"
-  :commit "830b05253ba8f35b80448e5de2201aecb6943840"
-  :revdesc "830b05253ba8"
+  :commit "08243a6e0b681c34eb4e4abf1d1c4c1b251ce91e"
+  :revdesc "08243a6e0b68"
   :keywords '("vc" "diff")
   :authors '(("Dmitry Gutov" . "dmitry@gutov.dev"))
   :maintainers '(("Dmitry Gutov" . "dmitry@gutov.dev")))
diff --git a/lisp/diff-hl/diff-hl.el b/lisp/diff-hl/diff-hl.el
index 8b7749fb..7e8bb891 100644
--- a/lisp/diff-hl/diff-hl.el
+++ b/lisp/diff-hl/diff-hl.el
@@ -5,8 +5,8 @@
 ;; Author:   Dmitry Gutov <dmitry@gutov.dev>
 ;; URL:      https://github.com/dgutov/diff-hl
 ;; Keywords: vc, diff
-;; Package-Version: 20250613.2144
-;; Package-Revision: 830b05253ba8
+;; Package-Version: 20250710.145
+;; Package-Revision: 08243a6e0b68
 ;; Package-Requires: ((cl-lib "0.2") (emacs "26.1"))
 
 ;; This file is part of GNU Emacs.
@@ -389,7 +389,13 @@ It can be a relative expression as well, such as \"HEAD^\" with Git, or
   (let* ((file buffer-file-name)
          (backend (vc-backend file)))
     (when backend
-      (let ((state (vc-state file backend)))
+      (let ((state (vc-state file backend))
+            ;; Workaround for debbugs#78946.
+            ;; This is fiddly, but we basically allow the thread to start, while
+            ;; prohibiting the async process call inside.
+            ;; That still makes it partially async.
+            (diff-hl-update-async (and diff-hl-update-async
+                                       (not (eq window-system 'ns)))))
         (cond
          ((diff-hl-modified-p state)
           (diff-hl-changes-from-buffer
@@ -923,6 +929,7 @@ Pops up a diff buffer that can be edited to choose the changes to stage."
          (file buffer-file-name)
          (dest-buffer (get-buffer-create "*diff-hl-stage-some*"))
          (orig-buffer (current-buffer))
+         (diff-hl-update-async nil)
          ;; FIXME: If the file name has double quotes, these need to be quoted.
          (file-base (file-name-nondirectory file)))
     (with-current-buffer dest-buffer
@@ -965,14 +972,18 @@ Pops up a diff buffer that can be edited to choose the changes to stage."
 
 (defun diff-hl-stage-finish ()
   (interactive)
-  (let ((count 0))
-    (when (diff-hl-stage-diff diff-hl-stage--orig)
+  (let ((count 0)
+        (orig-buffer diff-hl-stage--orig))
+    (when (diff-hl-stage-diff orig-buffer)
       (save-excursion
         (goto-char (point-min))
         (while (re-search-forward diff-hunk-header-re-unified nil t)
           (cl-incf count)))
       (message "Staged %d hunks" count)
-      (bury-buffer))))
+      (bury-buffer)
+      (unless diff-hl-show-staged-changes
+        (with-current-buffer orig-buffer
+          (diff-hl-update))))))
 
 (defvar diff-hl-command-map
   (let ((map (make-sparse-keymap)))
@@ -1027,7 +1038,7 @@ The value of this variable is a mode line template as in
         (add-hook 'text-scale-mode-hook 'diff-hl-maybe-redefine-bitmaps nil t))
     (remove-hook 'after-save-hook 'diff-hl-update t)
     (remove-hook 'after-change-functions 'diff-hl-edit t)
-    (remove-hook 'find-file-hook 'diff-hl-update t)
+    (remove-hook 'find-file-hook 'diff-hl-update-once t)
     (remove-hook 'after-revert-hook 'diff-hl-after-revert t)
     (remove-hook 'magit-revert-buffer-hook 'diff-hl-update t)
     (remove-hook 'magit-not-reverted-hook 'diff-hl-update t)
diff --git a/lisp/flycheck-posframe/flycheck-posframe-pkg.el b/lisp/flycheck-posframe/flycheck-posframe-pkg.el
new file mode 100644
index 00000000..7c96d236
--- /dev/null
+++ b/lisp/flycheck-posframe/flycheck-posframe-pkg.el
@@ -0,0 +1,11 @@
+;; -*- no-byte-compile: t; lexical-binding: nil -*-
+(define-package "flycheck-posframe" "20220715.133"
+  "Show flycheck error messages using posframe.el."
+  '((flycheck "0.24")
+    (emacs    "26")
+    (posframe "0.7.0"))
+  :url "https://github.com/alexmurray/flycheck-posframe"
+  :commit "19896b922c76a0f460bf3fe8d8ebc2f9ac9028d8"
+  :revdesc "19896b922c76"
+  :authors '(("Alex Murray" . "murray.alex@gmail.com"))
+  :maintainers '(("Alex Murray" . "murray.alex@gmail.com")))
diff --git a/lisp/flycheck-posframe/flycheck-posframe.el b/lisp/flycheck-posframe/flycheck-posframe.el
new file mode 100644
index 00000000..c1077fcd
--- /dev/null
+++ b/lisp/flycheck-posframe/flycheck-posframe.el
@@ -0,0 +1,256 @@
+;;; flycheck-posframe.el --- Show flycheck error messages using posframe.el
+
+;; Copyright (C) 2021 Alex Murray
+
+;; Author: Alex Murray <murray.alex@gmail.com>
+;; Maintainer: Alex Murray <murray.alex@gmail.com>
+;; URL: https://github.com/alexmurray/flycheck-posframe
+;; Package-Version: 20220715.133
+;; Package-Revision: 19896b922c76
+;; Package-Requires: ((flycheck "0.24") (emacs "26") (posframe "0.7.0"))
+
+;; This file is not part of GNU Emacs.
+
+;; This program is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;; Show flycheck error messages using posframe.el
+
+;;;; Setup
+
+;; (with-eval-after-load 'flycheck
+;;    (require 'flycheck-posframe)
+;;    (add-hook 'flycheck-mode-hook #'flycheck-posframe-mode))
+
+;;; Code:
+(require 'flycheck)
+(require 'posframe)
+
+(defgroup flycheck-posframe nil
+  "Display Flycheck errors in tooltips using posframe.el."
+  :prefix "flycheck-posframe-"
+  :group 'flycheck
+  :link '(url-link :tag "Github" "https://github.com/alexmurray/flycheck-posframe"))
+
+(defcustom flycheck-posframe-position 'point-bottom-left-corner
+  "Where to position the flycheck-posframe frame."
+  :group 'flycheck-posframe
+  :type '(choice
+          (const :tag "Center of the frame" frame-center)
+          (const :tag "Centered at the top of the frame" frame-top-center)
+          (const :tag "Left corner at the top of the frame" frame-top-left-corner)
+          (const :tag "Right corner at the top of the frame" frame-top-right-corner)
+          (const :tag "Left corner at the bottom of the frame" frame-bottom-left-corner)
+          (const :tag "Right corner at the bottom of the frame" frame-bottom-right-corner)
+          (const :tag "Center of the window" window-center)
+          (const :tag "Left corner at the top of the window" window-top-left-corner)
+          (const :tag "Right corner at the top of the window" window-top-right-corner)
+          (const :tag "Left corner at the bottom of the window" window-bottom-left-corner)
+          (const :tag "Right corner at the bottom of the window" window-bottom-right-corner)
+          (const :tag "Top left corner of point" point-top-left-corner)
+          (const :tag "Bottom left corner of point" point-bottom-left-corner))
+  :package-version '(flycheck-posframe . "0.6"))
+
+(defcustom flycheck-posframe-border-width 0
+  "Width of the border for a flycheck-posframe frame."
+  :group 'flycheck-posframe
+  :type 'integer
+  :package-version '(flycheck-posframe . "0.6"))
+
+(defcustom flycheck-posframe-border-use-error-face nil
+  "If non-nil, `flycheck-posframe-border-face' will be overriden by the foreground of the highest error level face."
+  :group 'flycheck-posframe
+  :type 'boolean
+  :package-version '(flycheck-posframe . "0.7"))
+
+(defcustom flycheck-posframe-prefix "\u27a4 "
+  "String to be displayed before every default message in posframe."
+  :group 'flycheck-posframe
+  :type 'string
+  :package-version '(flycheck-posframe . "0.3"))
+
+(defcustom flycheck-posframe-info-prefix flycheck-posframe-prefix
+  "String to be displayed before every info message in posframe."
+  :group 'flycheck-posframe
+  :type 'string
+  :package-version '(flycheck-posframe . "0.3"))
+
+(defcustom flycheck-posframe-warning-prefix flycheck-posframe-prefix
+  "String to be displayed before every warning message in posframe."
+  :group 'flycheck-posframe
+  :type 'string
+  :package-version '(flycheck-posframe . "0.3"))
+
+(defcustom flycheck-posframe-error-prefix flycheck-posframe-prefix
+  "String to be displayed before every error message in posframe."
+  :group 'flycheck-posframe
+  :type 'string
+  :package-version '(flycheck-posframe . "0.1"))
+
+(defface flycheck-posframe-face
+  '((t :inherit default))
+  "The default face to use for displaying messages in posframe."
+  :group 'flycheck-posframe
+  :package-version '(flycheck-posframe . "0.2"))
+
+(defface flycheck-posframe-info-face
+  '((t :inherit flycheck-posframe-face))
+  "The face to use for displaying info messages in posframe."
+  :group 'flycheck-posframe
+  :package-version '(flycheck-posframe . "0.3"))
+
+(defface flycheck-posframe-warning-face
+  '((t :inherit flycheck-posframe-face))
+  "The face to use for displaying warning messages in posframe."
+  :group 'flycheck-posframe
+  :package-version '(flycheck-posframe . "0.3"))
+
+(defface flycheck-posframe-error-face
+  '((t :inherit flycheck-posframe-face))
+  "The face to use for displaying warning messages in posframe."
+  :group 'flycheck-posframe
+  :package-version '(flycheck-posframe . "0.3"))
+
+(defface flycheck-posframe-background-face
+  '((t))
+  "The background color of the flycheck-posframe frame.
+Only the `background' is used in this face."
+  :group 'flycheck-posframe
+  :package-version '(flycheck-posframe . "0.4"))
+
+(defface flycheck-posframe-border-face
+  '((t))
+  "The border color of the flycheck-posframe frame.
+Only the `foreground' is used in this face."
+  :group 'flycheck-posframe
+  :package-version '(flycheck-posframe . "0.6"))
+
+(defvar flycheck-posframe-buffer "*flycheck-posframe-buffer*"
+  "The posframe buffer name use by flycheck-posframe.")
+
+(defvar flycheck-posframe-old-display-function nil
+  "The former value of `flycheck-display-errors-function'.")
+
+(defvar flycheck-posframe-last-position nil
+  "Last position for which a flycheck posframe was displayed.")
+
+(defun flycheck-posframe-check-position ()
+  "Update `flycheck-posframe-last-position', returning t if there was no change."
+  (equal flycheck-posframe-last-position
+         (setq flycheck-posframe-last-position
+               (list (current-buffer) (buffer-modified-tick) (point)))))
+
+(defcustom flycheck-posframe-inhibit-functions nil
+  "Functions to inhibit display of flycheck posframe."
+  :type 'hook
+  :group 'flycheck-posframe)
+
+(defun flycheck-posframe-get-prefix-for-error (err)
+  "Return the prefix which should be used to display ERR."
+  (pcase (flycheck-error-level err)
+    ('info flycheck-posframe-info-prefix)
+    ('warning flycheck-posframe-warning-prefix)
+    ('error flycheck-posframe-error-prefix)
+    (_ flycheck-posframe-prefix)))
+
+(defun flycheck-posframe-get-face-for-error (err)
+  "Return the face which should be used to display ERR."
+  (pcase (flycheck-error-level err)
+    ('info 'flycheck-posframe-info-face)
+    ('warning 'flycheck-posframe-warning-face)
+    ('error 'flycheck-posframe-error-face)
+    (_ 'flycheck-posframe-face)))
+
+(defun flycheck-posframe-highest-error-level-face (errs)
+  "Return the face corresponding to the highest error level from ERRS."
+  (flycheck-posframe-get-face-for-error (cl-reduce
+					 (lambda (err1 err2) (if (flycheck-error-level-< err1 err2) err2 err1))
+					 errs)))
+
+(defun flycheck-posframe-format-error (err)
+  "Formats ERR for display."
+  (propertize (concat
+               (flycheck-posframe-get-prefix-for-error err)
+               (flycheck-error-format-message-and-id err))
+              'face
+              `(:inherit ,(flycheck-posframe-get-face-for-error err))) )
+
+(defun flycheck-posframe-format-errors (errors)
+  "Formats ERRORS messages for display."
+  (let ((messages (sort
+                   (mapcar #'flycheck-posframe-format-error
+                           (delete-dups errors))
+                   'string-lessp)))
+    (mapconcat 'identity messages "\n")))
+
+(defun flycheck-posframe-hidehandler (_info)
+  "Hide posframe if position has changed since last display."
+  (not (flycheck-posframe-check-position)))
+
+(defun flycheck-posframe-show-posframe (errors)
+  "Display ERRORS, using posframe.el library."
+  (posframe-hide flycheck-posframe-buffer)
+  (when (and errors
+             (not (run-hook-with-args-until-success 'flycheck-posframe-inhibit-functions)))
+    (let ((poshandler (intern (format "posframe-poshandler-%s" flycheck-posframe-position))))
+      (unless (functionp poshandler)
+        (setq poshandler nil))
+      (flycheck-posframe-check-position)
+      (posframe-show
+       flycheck-posframe-buffer
+       :string (flycheck-posframe-format-errors errors)
+       :background-color (face-background 'flycheck-posframe-background-face nil t)
+       :position (point)
+       :internal-border-width flycheck-posframe-border-width
+       :internal-border-color (face-foreground (if flycheck-posframe-border-use-error-face
+						   (flycheck-posframe-highest-error-level-face errors)
+						 'flycheck-posframe-border-face) nil t)
+       :poshandler poshandler
+       :hidehandler #'flycheck-posframe-hidehandler))))
+
+;;;###autoload
+(defun flycheck-posframe-configure-pretty-defaults ()
+  "Configure some nicer settings for prettier display."
+  (setq flycheck-posframe-warning-prefix "\u26a0 ")
+  (setq flycheck-posframe-error-prefix "\u274c ")
+  (set-face-attribute 'flycheck-posframe-warning-face nil :inherit 'warning)
+  (set-face-attribute 'flycheck-posframe-error-face nil :inherit 'error))
+
+;;;###autoload
+(define-minor-mode flycheck-posframe-mode
+  "A minor mode to show Flycheck error messages in a posframe."
+  :lighter nil
+  :group 'flycheck-posframe
+  (cond
+   ;; Use our display function and remember the old one but only if we haven't
+   ;; yet configured it, to avoid activating twice.
+   ((and flycheck-posframe-mode
+         (not (eq flycheck-display-errors-function
+                  #'flycheck-posframe-show-posframe)))
+    (setq-local flycheck-posframe-old-display-function
+                flycheck-display-errors-function)
+    (setq-local flycheck-display-errors-function
+                #'flycheck-posframe-show-posframe))
+   ;; Reset the display function and remove ourselves from all hooks but only
+   ;; if the mode is still active.
+   ((and (not flycheck-posframe-mode)
+         (eq flycheck-display-errors-function
+             #'flycheck-posframe-show-posframe))
+    (setq-local flycheck-display-errors-function
+                flycheck-posframe-old-display-function)
+    (setq-local flycheck-posframe-old-display-function nil))))
+
+(provide 'flycheck-posframe)
+;;; flycheck-posframe.el ends here
diff --git a/lisp/magit/git-rebase.el b/lisp/magit/git-rebase.el
index 486b0422..dbcb8535 100644
--- a/lisp/magit/git-rebase.el
+++ b/lisp/magit/git-rebase.el
@@ -321,6 +321,10 @@ region is active, act on all lines touched by the region."
    (abbrev)))
 
 (defvar git-rebase-line-regexps
+  ;; 1: action, 2: option, 3: target, 4: "#", 5: description.
+  ;;
+  ;; <action> <commit> [[# ] <oneline>]
+  ;; fixup [-C|-c] <commit> [[# ] <oneline>]
   `((commit . ,(concat
                 (regexp-opt '("d"    "drop"
                               "e"    "edit"
@@ -331,7 +335,8 @@ region is active, act on all lines touched by the region."
                               "r"    "reword"
                               "s"    "squash")
                             "\\(?1:")
-                " \\(?3:[^ \n]+\\) ?\\(?4:.*\\)"))
+                " \\(?3:[^ \n]+\\)"
+                "\\(?: \\(?4:# \\)?\\(?5:.*\\)\\)?"))
     (exec . "\\(?1:x\\|exec\\) \\(?3:.*\\)")
     (bare . ,(concat (regexp-opt '("b" "break" "noop") "\\(?1:")
                      " *$"))
@@ -339,11 +344,14 @@ region is active, act on all lines touched by the region."
                                     "t" "reset"
                                     "u" "update-ref")
                                   "\\(?1:")
-                      " \\(?3:[^ \n]+\\) ?\\(?4:.*\\)"))
+                      " \\(?3:[^ \n]+\\)"
+                      "\\(?: \\(?4:# \\)?\\(?5:.*\\)\\)?"))
+    ;; merge [-C <commit> | -c <commit>] <label> [# <oneline>]
+    ;; <commit> is matched by group 22 (part of group 2), not group 3
     (merge . ,(concat "\\(?1:m\\|merge\\) "
-                      "\\(?:\\(?2:-[cC] [^ \n]+\\) \\)?"
+                      "\\(?:\\(?2:\\(?21:-[cC]\\) \\(?22:[^ \n]+\\)\\) \\)?"
                       "\\(?3:[^ \n]+\\)"
-                      " ?\\(?4:.*\\)"))))
+                      "\\(?: \\(?4:# \\)?\\(?5:.*\\)\\)?"))))
 
 ;;;###autoload
 (defun git-rebase-current-line (&optional batch)
@@ -356,7 +364,7 @@ BATCH also ignores commented lines."
     (goto-char (line-beginning-position))
     (if-let ((re-start (if batch
                            "^"
-                         (format "^\\(?5:%s\\)? *"
+                         (format "^\\(?99:%s\\)? *"
                                  (regexp-quote comment-start))))
              (type (seq-some (pcase-lambda (`(,type . ,re))
                                (let ((case-fold-search nil))
@@ -369,8 +377,8 @@ BATCH also ignores commented lines."
                                action))
          :action-options (match-string-no-properties 2)
          :target         (match-string-no-properties 3)
-         :trailer        (match-string-no-properties 4)
-         :comment-p      (and (match-string 5) t))
+         :trailer        (match-string-no-properties 5)
+         :comment-p      (and (match-string 99) t))
       (and (not batch)
            ;; Use empty object rather than nil to ease handling.
            (git-rebase-action)))))
@@ -394,7 +402,10 @@ of its action type."
             ((and action (eq action-type 'commit))
              (let ((inhibit-read-only t))
                (magit-delete-line)
-               (insert (concat action " " target " " trailer "\n"))))
+               (insert (concat action " " target " "))
+               (when (magit-git-version>= "2.50.0")
+                 (insert "# "))
+               (insert (concat trailer "\n"))))
             ((and (not action) action-type)
              (let ((inhibit-read-only t))
                (if comment-p
@@ -804,7 +815,8 @@ running \"man git-rebase\" at the command line) for details."
   `((,(concat "^" (cdr (assq 'commit git-rebase-line-regexps)))
      (1 'git-rebase-action)
      (3 'git-rebase-hash)
-     (4 'git-rebase-description))
+     (4 'font-lock-comment-face nil t)
+     (5 'git-rebase-description nil t))
     (,(concat "^" (cdr (assq 'exec git-rebase-line-regexps)))
      (1 'git-rebase-action)
      (3 'git-rebase-description))
@@ -813,32 +825,33 @@ running \"man git-rebase\" at the command line) for details."
     (,(concat "^" (cdr (assq 'label git-rebase-line-regexps)))
      (1 'git-rebase-action)
      (3 'git-rebase-label)
-     (4 'font-lock-comment-face))
-    ("^\\(m\\(?:erge\\)?\\) -[Cc] \\([^ \n]+\\) \\([^ \n]+\\)\\( #.*\\)?"
-     (1 'git-rebase-action)
-     (2 'git-rebase-hash)
-     (3 'git-rebase-label)
-     (4 'font-lock-comment-face))
-    ("^\\(m\\(?:erge\\)?\\) \\([^ \n]+\\)"
-     (1 'git-rebase-action)
-     (2 'git-rebase-label))
+     (4 'font-lock-comment-face nil t)
+     (5 'git-rebase-description nil t))
+    (,(concat "^" (cdr (assq 'merge git-rebase-line-regexps)))
+     (1  'git-rebase-action)
+     (21 'git-rebase-action nil t)
+     (22 'git-rebase-hash t t)
+     (3  'magit-branch-local)
+     (4  'font-lock-comment-face nil t)
+     (5  'git-rebase-description nil t))
+    (,(format "^%s Branch \\(.*\\)" comment-start)
+     (1 'magit-branch-local t))
     ("^drop \\(.+\\)"
-     1 'git-rebase-killed-action t)
+     (1 'git-rebase-killed-action t))
     (,(concat git-rebase-comment-re " *"
               (cdr (assq 'commit git-rebase-line-regexps)))
-     0 'git-rebase-killed-action t)
-    (git-rebase-match-comment-line 0 'font-lock-comment-face)
+     (0 'git-rebase-killed-action t))
+    (git-rebase-match-comment-line
+     (0 'font-lock-comment-face))
     ("\\[[^[]*\\]"
-     0 'magit-keyword t)
+     (0 'magit-keyword t))
     ("\\(?:fixup!\\|squash!\\|amend!\\)"
-     0 'magit-keyword-squash t)
+     (0 'magit-keyword-squash t))
     (,(format "^%s Rebase \\([^ ]*\\) onto \\([^ ]*\\)" comment-start)
      (1 'git-rebase-comment-hash t)
      (2 'git-rebase-comment-hash t))
     (,(format "^%s \\(Commands:\\)" comment-start)
-     (1 'git-rebase-comment-heading t))
-    (,(format "^%s Branch \\(.*\\)" comment-start)
-     (1 'git-rebase-label t))))
+     (1 'git-rebase-comment-heading t))))
 
 (defun git-rebase-mode-show-keybindings ()
   "Modify the \"Commands:\" section of the comment Git generates.
diff --git a/lisp/magit/magit-blame.el b/lisp/magit/magit-blame.el
index e87bd4fc..1de4e8f9 100644
--- a/lisp/magit/magit-blame.el
+++ b/lisp/magit/magit-blame.el
@@ -432,14 +432,14 @@ modes is toggled, then this mode also gets toggled automatically.
     (set-process-sentinel magit-this-process
                           #'magit-blame-process-quickstart-sentinel)))
 
-(defun magit-blame-run-process (revision file args &optional lines)
+(defun magit-blame-run-process (rev file args &optional lines)
   (let ((process (magit-parse-git-async
                   "blame" "--incremental" args
                   (and lines (list "-L" (apply #'format "%s,%s" lines)))
-                  revision "--" file)))
+                  rev "--" file)))
     (set-process-filter   process #'magit-blame-process-filter)
     (set-process-sentinel process #'magit-blame-process-sentinel)
-    (process-put process 'arguments (list revision file args))
+    (process-put process 'arguments (list rev file args))
     (setq magit-blame-cache (make-hash-table :test #'equal))
     (setq magit-blame-process process)))
 
diff --git a/lisp/magit/magit-branch.el b/lisp/magit/magit-branch.el
index 56a754e5..2c84d476 100644
--- a/lisp/magit/magit-branch.el
+++ b/lisp/magit/magit-branch.el
@@ -252,24 +252,24 @@ has to be used to view and change branch related variables."
   (transient-args 'magit-branch))
 
 ;;;###autoload
-(defun magit-checkout (revision &optional args)
-  "Checkout REVISION, updating the index and the working tree.
-If REVISION is a local branch, then that becomes the current
+(defun magit-checkout (commit &optional args)
+  "Checkout COMMIT, updating the index and the working tree.
+If COMMIT is a local branch, then that becomes the current
 branch.  If it is something else, then `HEAD' becomes detached.
 Checkout fails if the working tree or the staging area contain
 changes.
-\n(git checkout REVISION)."
+\n(git checkout COMMIT)."
   (declare (interactive-only magit--checkout))
   (interactive (list (magit-read-other-branch-or-commit "Checkout")
                      (magit-branch-arguments)))
-  (when (string-match "\\`heads/\\(.+\\)" revision)
-    (setq revision (match-string 1 revision)))
-  (magit-run-git-async "checkout" args revision))
+  (when (string-match "\\`heads/\\(.+\\)" commit)
+    (setq commit (match-string 1 commit)))
+  (magit-run-git-async "checkout" args commit))
 
-(defun magit--checkout (revision &optional args)
-  (when (string-match "\\`heads/\\(.+\\)" revision)
-    (setq revision (match-string 1 revision)))
-  (magit-call-git "checkout" args revision))
+(defun magit--checkout (rev &optional args)
+  (when (string-match "\\`heads/\\(.+\\)" rev)
+    (setq rev (match-string 1 rev)))
+  (magit-call-git "checkout" args rev))
 
 ;;;###autoload
 (defun magit-branch-create (branch start-point)
diff --git a/lisp/magit/magit-extras.el b/lisp/magit/magit-extras.el
index 7e346a68..e5501199 100644
--- a/lisp/magit/magit-extras.el
+++ b/lisp/magit/magit-extras.el
@@ -431,8 +431,8 @@ Otherwise the author dates are also changed."
   :type 'boolean)
 
 ;;;###autoload
-(defun magit-reshelve-since (rev keyid)
-  "Change the author and committer dates of the commits since REV.
+(defun magit-reshelve-since (commit keyid)
+  "Change the author and committer dates of the commits since COMMIT.
 
 Ask the user for the first reachable commit whose dates should
 be changed.  Then read the new date for that commit.  The initial
@@ -453,7 +453,7 @@ list returned by `magit-rebase-arguments'."
                       (user-error "Refusing to reshelve detached head")))
          (backup (concat "refs/original/refs/heads/" current)))
     (cond
-     ((not rev)
+     ((not commit)
       (when (and (magit-ref-p backup)
                  (not (magit-y-or-n-p
                        (format "Backup ref %s already exists.  Override? "
@@ -470,7 +470,7 @@ list returned by `magit-rebase-arguments'."
                    (+ (floor time)
                       (* offset 60)
                       (- (car (decode-time time)))))))
-        (let* ((start (concat rev "^"))
+        (let* ((start (concat commit "^"))
                (range (concat start ".." current))
                (time-rev (adjust (float-time (string-to-number
                                               (magit-rev-format "%at" start)))
diff --git a/lisp/magit/magit-git.el b/lisp/magit/magit-git.el
index 9ff3fbef..aa0282a8 100644
--- a/lisp/magit/magit-git.el
+++ b/lisp/magit/magit-git.el
@@ -1999,32 +1999,32 @@ SORTBY is a key or list of keys to pass to the `--sort' flag of
 (defun magit-list-remote-branches (&optional remote)
   (magit-list-refs (concat "refs/remotes/" remote)))
 
-(defun magit-list-related-branches (relation &optional commit &rest args)
+(defun magit-list-related-branches (relation &optional rev &rest args)
   (seq-remove (##string-match-p "\\(\\`(HEAD\\|HEAD -> \\)" %)
               (mapcar (##substring % 2)
-                      (magit-git-lines "branch" args relation commit))))
+                      (magit-git-lines "branch" args relation rev))))
 
-(defun magit-list-containing-branches (&optional commit &rest args)
-  (magit-list-related-branches "--contains" commit args))
+(defun magit-list-containing-branches (&optional rev &rest args)
+  (magit-list-related-branches "--contains" rev args))
 
-(defun magit-list-publishing-branches (&optional commit)
-  (seq-filter (##magit-rev-ancestor-p (or commit "HEAD") %)
+(defun magit-list-publishing-branches (&optional rev)
+  (seq-filter (##magit-rev-ancestor-p (or rev "HEAD") %)
               magit-published-branches))
 
-(defun magit-list-merged-branches (&optional commit &rest args)
-  (magit-list-related-branches "--merged" commit args))
+(defun magit-list-merged-branches (&optional rev &rest args)
+  (magit-list-related-branches "--merged" rev args))
 
-(defun magit-list-unmerged-branches (&optional commit &rest args)
-  (magit-list-related-branches "--no-merged" commit args))
+(defun magit-list-unmerged-branches (&optional rev &rest args)
+  (magit-list-related-branches "--no-merged" rev args))
 
 (defun magit-list-unmerged-to-upstream-branches ()
   (seq-filter (##and-let* ((upstream (magit-get-upstream-branch %)))
                 (member % (magit-list-unmerged-branches upstream)))
               (magit-list-local-branch-names)))
 
-(defun magit-list-branches-pointing-at (commit)
+(defun magit-list-branches-pointing-at (rev)
   (let ((re (format "\\`%s refs/\\(heads\\|remotes\\)/\\(.*\\)\\'"
-                    (magit-rev-verify commit))))
+                    (magit-rev-verify rev))))
     (seq-keep (##and (string-match re %)
                      (let ((name (match-string 2 %)))
                        (and (not (string-suffix-p "HEAD" name))
@@ -2285,16 +2285,16 @@ If `first-parent' is set, traverse only first parents."
 (defun magit-rev-abbrev (rev)
   (magit-rev-parse (magit-abbrev-arg "short") rev))
 
-(defun magit-commit-children (commit &optional args)
+(defun magit-commit-children (rev &optional args)
   (seq-keep (lambda (line)
               (pcase-let ((`(,child . ,parents) (split-string line " ")))
-                (and (member commit parents) child)))
+                (and (member rev parents) child)))
             (magit-git-lines "log" "--format=%H %P"
                              (or args (list "--branches" "--tags" "--remotes"))
-                             "--not" commit)))
+                             "--not" rev)))
 
-(defun magit-commit-parents (commit)
-  (and-let* ((str (magit-git-string "rev-list" "-1" "--parents" commit)))
+(defun magit-commit-parents (rev)
+  (and-let* ((str (magit-git-string "rev-list" "-1" "--parents" rev)))
     (cdr (split-string str))))
 
 (defun magit-patch-id (rev)
@@ -2444,14 +2444,14 @@ and this option only controls what face is used.")
 (defun magit-object-type (object)
   (magit-git-string "cat-file" "-t" object))
 
-(defmacro magit-with-blob (commit file &rest body)
+(defmacro magit-with-blob (rev file &rest body)
   (declare (indent 2)
            (debug (form form body)))
   `(magit--with-temp-process-buffer
      (let ((buffer-file-name ,file))
        (save-excursion
          (magit-git-insert "cat-file" "-p"
-                           (concat ,commit ":" buffer-file-name)))
+                           (concat ,rev ":" buffer-file-name)))
        (decode-coding-inserted-region
         (point-min) (point-max) buffer-file-name t nil nil t)
        ,@body)))
diff --git a/lisp/magit/magit-log.el b/lisp/magit/magit-log.el
index eaff50bd..187c800b 100644
--- a/lisp/magit/magit-log.el
+++ b/lisp/magit/magit-log.el
@@ -780,7 +780,7 @@ restrict the log to the lines that the region touches."
     (user-error "Buffer isn't visiting a file")))
 
 ;;;###autoload
-(defun magit-log-trace-definition (file fn rev)
+(defun magit-log-trace-definition (file fn commit)
   "Show log for the definition at point."
   (interactive (list (or (magit-file-relative-name)
                          (user-error "Buffer isn't visiting a file"))
@@ -791,7 +791,7 @@ restrict the log to the lines that the region touches."
                          "HEAD")))
   (require 'magit)
   (magit-log-setup-buffer
-   (list rev)
+   (list commit)
    (cons (format "-L:%s%s:%s"
                  (string-replace ":" "\\:" (regexp-quote fn))
                  (if (derived-mode-p 'lisp-mode 'emacs-lisp-mode)
@@ -937,10 +937,10 @@ is displayed in the current frame."
                       "\\[magit-log-double-commit-limit] first"))))
         (user-error "Parent %s does not exist" parent-rev)))))
 
-(defun magit-log-move-to-revision (rev)
-  "Read a revision and move to it in current log buffer.
+(defun magit-log-move-to-revision (commit)
+  "Read a commit and move to it in current log buffer.
 
-If the chosen reference or revision isn't being displayed in
+If the chosen reference or commit isn't being displayed in
 the current log buffer, then inform the user about that and do
 nothing else.
 
@@ -962,8 +962,8 @@ of the current repository first; creating it if necessary."
                (pop-to-buffer-same-window buf)))
             (t
              (apply #'magit-log-all-branches (magit-log-arguments))))
-    (unless (magit-log-goto-commit-section (magit-rev-abbrev rev))
-      (user-error "%s isn't visible in the current log buffer" rev))))
+    (unless (magit-log-goto-commit-section (magit-rev-abbrev commit))
+      (user-error "%s isn't visible in the current log buffer" commit))))
 
 ;;;; Shortlog Commands
 
@@ -996,12 +996,12 @@ of the current repository first; creating it if necessary."
         (switch-to-buffer-other-window (current-buffer))))))
 
 ;;;###autoload
-(defun magit-shortlog-since (rev args)
+(defun magit-shortlog-since (commit args)
   "Show a history summary for commits since REV."
   (interactive
    (list (magit-read-branch-or-commit "Shortlog since" (magit-get-current-tag))
          (transient-args 'magit-shortlog)))
-  (magit-git-shortlog (concat rev "..") args))
+  (magit-git-shortlog (concat commit "..") args))
 
 ;;;###autoload
 (defun magit-shortlog-range (rev-or-range args)
diff --git a/lisp/magit/magit-pkg.el b/lisp/magit/magit-pkg.el
index 378e33c2..99afdd86 100644
--- a/lisp/magit/magit-pkg.el
+++ b/lisp/magit/magit-pkg.el
@@ -1,5 +1,5 @@
 ;; -*- no-byte-compile: t; lexical-binding: nil -*-
-(define-package "magit" "20250704.2300"
+(define-package "magit" "20250711.1903"
   "A Git porcelain inside Emacs."
   '((emacs         "27.1")
     (compat        "30.1")
@@ -9,8 +9,8 @@
     (transient     "0.9.3")
     (with-editor   "3.4.4"))
   :url "https://github.com/magit/magit"
-  :commit "5b820a1d1e94649e0f218362286d520d9f29ac2c"
-  :revdesc "5b820a1d1e94"
+  :commit "d8b4690900a00bc32e9f4dd0fb71b96614a96b51"
+  :revdesc "d8b4690900a0"
   :keywords '("git" "tools" "vc")
   :authors '(("Marius Vollmer" . "marius.vollmer@gmail.com")
              ("Jonas Bernoulli" . "emacs.magit@jonas.bernoulli.dev"))
diff --git a/lisp/magit/magit-process.el b/lisp/magit/magit-process.el
index fcc4b303..9b54b529 100644
--- a/lisp/magit/magit-process.el
+++ b/lisp/magit/magit-process.el
@@ -464,7 +464,7 @@ After Git returns, the current buffer (if it is a Magit buffer)
 as well as the current repository's status buffer are refreshed.
 
 Process output goes into a new section in the buffer returned by
-`magit-process-buffer'."
+`magit-process-buffer'.  Return the exit code."
   (let ((magit--refresh-cache (list (cons 0 0))))
     (prog1 (magit-call-git args)
       (when (member (car args) '("init" "clone"))
@@ -483,7 +483,7 @@ The arguments ARGS specify arguments to Git, they are flattened
 before use.
 
 Process output goes into a new section in the buffer returned by
-`magit-process-buffer'."
+`magit-process-buffer'.  Return the exit code."
   (run-hooks 'magit-pre-call-git-hook)
   (let ((default-process-coding-system (magit--process-coding-system)))
     (apply #'magit-call-process
@@ -493,7 +493,7 @@ Process output goes into a new section in the buffer returned by
 (defun magit-call-process (program &rest args)
   "Call PROGRAM synchronously in a separate process.
 Process output goes into a new section in the buffer returned by
-`magit-process-buffer'."
+`magit-process-buffer'.  Return the exit code."
   (pcase-let ((`(,process-buf . ,section)
                (magit-process-setup program args)))
     (magit-process-finish
@@ -514,8 +514,9 @@ ensure unix eol conversion."
 
 (defun magit-process-file (process &optional infile buffer display &rest args)
   "Process files synchronously in a separate process.
-Similar to `process-file' but temporarily enable Cygwin's
-\"noglob\" option during the call and ensure unix eol conversion."
+Return the exit code.  Similar to `process-file' but temporarily
+enable Cygwin's \"noglob\" option during the call and ensure unix
+eol conversion."
   (when magit-process-record-invocations
     (let ((messages-buffer-name magit-process-record-buffer-name)
           (inhibit-message t))
@@ -552,7 +553,7 @@ ARGS is flattened and then used as arguments to Git.
 
 The current buffer's content is used as the process's standard
 input.  The buffer is assumed to be temporary and thus OK to
-modify.
+modify.  Return the exit code.
 
 Function `magit-git-executable' specifies the Git executable and
 option `magit-git-global-arguments' specifies constant arguments.
diff --git a/lisp/magit/magit-refs.el b/lisp/magit/magit-refs.el
index 2bcee3e7..a26981a5 100644
--- a/lisp/magit/magit-refs.el
+++ b/lisp/magit/magit-refs.el
@@ -804,9 +804,9 @@ line is inserted at all."
           (message "No cherries for %s" ref)
         (magit-make-margin-overlay)))))
 
-(defun magit-refs--format-margin (commit)
-  (if-let ((line (magit-rev-format "%cN%x00%ct" commit)))
-      (apply #'magit-log-format-margin commit (split-string line "\0"))
+(defun magit-refs--format-margin (rev)
+  (if-let ((line (magit-rev-format "%cN%x00%ct" rev)))
+      (apply #'magit-log-format-margin rev (split-string line "\0"))
     (magit-make-margin-overlay)))
 
 ;;; _
diff --git a/lisp/magit/magit-reset.el b/lisp/magit/magit-reset.el
index 4baa64b2..a166dd93 100644
--- a/lisp/magit/magit-reset.el
+++ b/lisp/magit/magit-reset.el
@@ -55,14 +55,14 @@
 ;;;###autoload
 (defun magit-reset-soft (commit)
   "Reset the `HEAD' to COMMIT, but not the index and working tree.
-\n(git reset --soft REVISION)"
+\n(git reset --soft COMMIT)"
   (interactive (list (magit-reset-read-branch-or-commit "Soft reset %s to")))
   (magit-reset-internal "--soft" commit))
 
 ;;;###autoload
 (defun magit-reset-hard (commit)
   "Reset the `HEAD', index, and working tree to COMMIT.
-\n(git reset --hard REVISION)"
+\n(git reset --hard COMMIT)"
   (interactive (list (magit-reset-read-branch-or-commit
                       (concat (magit--propertize-face "Hard" 'bold)
                               " reset %s to"))))
@@ -71,7 +71,7 @@
 ;;;###autoload
 (defun magit-reset-keep (commit)
   "Reset the `HEAD' and index to COMMIT, while keeping uncommitted changes.
-\n(git reset --keep REVISION)"
+\n(git reset --keep COMMIT)"
   (interactive (list (magit-reset-read-branch-or-commit "Reset %s to")))
   (magit-reset-internal "--keep" commit))
 
diff --git a/lisp/magit/magit-stash.el b/lisp/magit/magit-stash.el
index 1ca279db..84fbebdb 100644
--- a/lisp/magit/magit-stash.el
+++ b/lisp/magit/magit-stash.el
@@ -450,8 +450,8 @@ Then apply STASH, dropping it if it applies cleanly."
                                                 ((not worktree) "staged")
                                                 (t "local"))))))
 
-(defun magit-stash-store (message ref commit)
-  (magit-update-ref ref message commit))
+(defun magit-stash-store (message ref rev)
+  (magit-update-ref ref message rev))
 
 (defun magit-stash-create (message index worktree untracked)
   (unless (magit-rev-parse "--verify" "HEAD")
@@ -637,8 +637,8 @@ See also info node `(magit)Section Movement'."
 (cl-defmethod magit-buffer-value (&context (major-mode magit-stash-mode))
   magit-buffer-revision)
 
-(defun magit-stash-insert-section (commit range message &optional files)
-  (magit-insert-section (commit commit)
+(defun magit-stash-insert-section (rev range message &optional files)
+  (magit-insert-section (commit rev)
     (magit-insert-heading message)
     (magit--insert-diff nil
       "diff" range "-p" "--no-prefix" magit-buffer-diff-args
diff --git a/lisp/magit/magit-tag.el b/lisp/magit/magit-tag.el
index 78c87b27..a7863622 100644
--- a/lisp/magit/magit-tag.el
+++ b/lisp/magit/magit-tag.el
@@ -62,8 +62,8 @@
   :history-key 'magit:--gpg-sign)
 
 ;;;###autoload
-(defun magit-tag-create (name rev &optional args)
-  "Create a new tag with the given NAME at REV.
+(defun magit-tag-create (name commit &optional args)
+  "Create a new tag with the given NAME at COMMIT.
 With a prefix argument annotate the tag.
 \n(git tag [--annotate] NAME REV)"
   (interactive (list (magit-read-tag "Tag name")
@@ -72,7 +72,7 @@ With a prefix argument annotate the tag.
                        (when current-prefix-arg
                          (cl-pushnew "--annotate" args :test #'equal))
                        args)))
-  (magit-run-git-with-editor "tag" args name rev))
+  (magit-run-git-with-editor "tag" args name commit))
 
 ;;;###autoload
 (defun magit-tag-delete (tags)
diff --git a/lisp/magit/magit.el b/lisp/magit/magit.el
index 5e2af919..32ac87b6 100644
--- a/lisp/magit/magit.el
+++ b/lisp/magit/magit.el
@@ -17,8 +17,8 @@
 ;; Homepage: https://github.com/magit/magit
 ;; Keywords: git tools vc
 
-;; Package-Version: 20250704.2300
-;; Package-Revision: 5b820a1d1e94
+;; Package-Version: 20250711.1903
+;; Package-Revision: d8b4690900a0
 ;; Package-Requires: (
 ;;     (emacs "27.1")
 ;;     (compat "30.1")
diff --git a/lisp/magit/magit.info b/lisp/magit/magit.info
index c30f6780..b9e4ed24 100644
--- a/lisp/magit/magit.info
+++ b/lisp/magit/magit.info
@@ -8474,6 +8474,9 @@ for git to complete before letting the user do something else.  For
 example after staging a change it is useful to wait until after the
 refresh because that also automatically moves to the next change.
 
+   The synchronous functions return the exit code, while the
+asynchronous functions return the process object.
+
  -- Function: magit-call-git &rest args
      Calls git synchronously with ARGS.
 
@@ -10099,8 +10102,8 @@ Appendix D Function and Command Index
 * magit-builtin-completing-read:         Completion Confirmation and the Selection.
                                                               (line 358)
 * magit-bundle:                          Bundle.              (line   8)
-* magit-call-git:                        Calling Git.         (line 135)
-* magit-call-process:                    Calling Git.         (line 138)
+* magit-call-git:                        Calling Git.         (line 138)
+* magit-call-process:                    Calling Git.         (line 141)
 * magit-cancel-section:                  Section Plumbing.    (line  72)
 * magit-checkout:                        Branching.           (line  97)
 * magit-cherry:                          Logging.             (line 382)
@@ -10272,7 +10275,7 @@ Appendix D Function and Command Index
 * magit-generate-buffer-name-default-function: Modes and Buffers.
                                                               (line 141)
 * magit-get-section:                     Section Plumbing.    (line 130)
-* magit-git:                             Calling Git.         (line 153)
+* magit-git:                             Calling Git.         (line 156)
 * magit-git-command:                     Running Git.         (line  97)
 * magit-git-command-topdir:              Running Git.         (line  89)
 * magit-git-exit-code:                   Calling Git.         (line  37)
@@ -10287,7 +10290,7 @@ Appendix D Function and Command Index
 * magit-git-string:                      Calling Git.         (line  59)
 * magit-git-success:                     Calling Git.         (line  40)
 * magit-git-true:                        Calling Git.         (line  48)
-* magit-git-wash:                        Calling Git.         (line 157)
+* magit-git-wash:                        Calling Git.         (line 160)
 * magit-go-backward:                     Logging.             (line 116)
 * magit-go-backward <1>:                 Diffing.             (line 173)
 * magit-go-forward:                      Logging.             (line 119)
@@ -10506,11 +10509,11 @@ Appendix D Function and Command Index
 * magit-revert-and-commit:               Cherry Picking.      (line 106)
 * magit-revert-no-commit:                Cherry Picking.      (line 111)
 * magit-run:                             Running Git.         (line  85)
-* magit-run-git:                         Calling Git.         (line 141)
-* magit-run-git-async:                   Calling Git.         (line 166)
+* magit-run-git:                         Calling Git.         (line 144)
+* magit-run-git-async:                   Calling Git.         (line 169)
 * magit-run-git-gui:                     Running Git.         (line 131)
-* magit-run-git-with-editor:             Calling Git.         (line 178)
-* magit-run-git-with-input:              Calling Git.         (line 144)
+* magit-run-git-with-editor:             Calling Git.         (line 181)
+* magit-run-git-with-input:              Calling Git.         (line 147)
 * magit-run-gitk:                        Running Git.         (line 122)
 * magit-run-gitk-all:                    Running Git.         (line 125)
 * magit-run-gitk-branches:               Running Git.         (line 128)
@@ -10580,8 +10583,8 @@ Appendix D Function and Command Index
                                                               (line  63)
 * magit-stage-modified:                  Staging and Unstaging.
                                                               (line  36)
-* magit-start-git:                       Calling Git.         (line 189)
-* magit-start-process:                   Calling Git.         (line 207)
+* magit-start-git:                       Calling Git.         (line 192)
+* magit-start-process:                   Calling Git.         (line 210)
 * magit-stash:                           Stashing.            (line   9)
 * magit-stash-apply:                     Stashing.            (line  52)
 * magit-stash-both:                      Stashing.            (line  14)
@@ -10800,7 +10803,7 @@ Appendix E Variable Index
 * magit-prefer-remote-upstream:          Branching.           (line 431)
 * magit-prefix-use-buffer-arguments:     Transient Arguments and Buffer Variables.
                                                               (line  65)
-* magit-process-raise-error:             Calling Git.         (line 232)
+* magit-process-raise-error:             Calling Git.         (line 235)
 * magit-pull-or-fetch:                   Fetching.            (line  52)
 * magit-reflog-margin:                   Logging.             (line 344)
 * magit-refresh-args:                    Refreshing Buffers.  (line  52)
@@ -10841,7 +10844,7 @@ Appendix E Variable Index
 * magit-status-sections-hook:            Status Buffer.       (line 122)
 * magit-status-show-untracked-files:     Status Buffer.       (line 197)
 * magit-submodule-list-columns:          Submodules.          (line  25)
-* magit-this-process:                    Calling Git.         (line 228)
+* magit-this-process:                    Calling Git.         (line 231)
 * magit-uniquify-buffer-names:           Modes and Buffers.   (line 190)
 * magit-unstage-committed:               Staging and Unstaging.
                                                               (line  52)
@@ -11016,39 +11019,39 @@ Node: Plumbing361017
 Node: Calling Git361842
 Ref: Getting a Value from Git363301
 Ref: Calling Git for Effect366913
-Node: Section Plumbing372699
-Ref: Creating Sections372851
-Ref: Section Selection376644
-Ref: Matching Sections378317
-Node: Refreshing Buffers384131
-Node: Conventions387271
-Ref: Theming Faces387435
-Node: FAQ395468
-Node: FAQ - How to ...?395904
-Ref: How to pronounce Magit?396037
-Ref: How to show git's output?396729
-Ref: How to install the gitman info manual?397346
-Ref: How to show diffs for gpg-encrypted files?398151
-Ref: How does branching and pushing work?398560
-Ref: Should I disable VC?398724
-Node: FAQ - Issues and Errors399207
-Ref: Magit is slow399352
-Ref: I changed several thousand files at once and now Magit is unusable399498
-Ref: I am having problems committing400037
-Ref: I am using MS Windows and cannot push with Magit400302
-Ref: I am using macOS and SOMETHING works in shell but not in Magit400700
-Ref: Expanding a file to show the diff causes it to disappear401287
-Ref: Point is wrong in the COMMIT_EDITMSG buffer401637
-Ref: The mode-line information isn't always up-to-date402461
-Ref: A branch and tag sharing the same name breaks SOMETHING403292
-Ref: My Git hooks work on the command-line but not inside Magit403940
-Ref: git-commit-mode isn't used when committing from the command-line404532
-Ref: Point ends up inside invisible text when jumping to a file-visiting buffer406520
-Ref: I am no longer able to save popup defaults407112
-Node: Debugging Tools407907
-Node: Keystroke Index411842
-Node: Function and Command Index449938
-Node: Variable Index501594
+Node: Section Plumbing372811
+Ref: Creating Sections372963
+Ref: Section Selection376756
+Ref: Matching Sections378429
+Node: Refreshing Buffers384243
+Node: Conventions387383
+Ref: Theming Faces387547
+Node: FAQ395580
+Node: FAQ - How to ...?396016
+Ref: How to pronounce Magit?396149
+Ref: How to show git's output?396841
+Ref: How to install the gitman info manual?397458
+Ref: How to show diffs for gpg-encrypted files?398263
+Ref: How does branching and pushing work?398672
+Ref: Should I disable VC?398836
+Node: FAQ - Issues and Errors399319
+Ref: Magit is slow399464
+Ref: I changed several thousand files at once and now Magit is unusable399610
+Ref: I am having problems committing400149
+Ref: I am using MS Windows and cannot push with Magit400414
+Ref: I am using macOS and SOMETHING works in shell but not in Magit400812
+Ref: Expanding a file to show the diff causes it to disappear401399
+Ref: Point is wrong in the COMMIT_EDITMSG buffer401749
+Ref: The mode-line information isn't always up-to-date402573
+Ref: A branch and tag sharing the same name breaks SOMETHING403404
+Ref: My Git hooks work on the command-line but not inside Magit404052
+Ref: git-commit-mode isn't used when committing from the command-line404644
+Ref: Point ends up inside invisible text when jumping to a file-visiting buffer406632
+Ref: I am no longer able to save popup defaults407224
+Node: Debugging Tools408019
+Node: Keystroke Index411954
+Node: Function and Command Index450050
+Node: Variable Index501706
 
 End Tag Table
 
diff --git a/lisp/my/my-autoloads.el b/lisp/my/my-autoloads.el
index 740a85ac..7c0474bf 100644
--- a/lisp/my/my-autoloads.el
+++ b/lisp/my/my-autoloads.el
@@ -88,7 +88,8 @@ See `org-latex-export-to-pdf'
 
 ;;; Generated autoloads from my-tool-bar.el
 
-(register-definition-prefixes "my-tool-bar" '("my-tool-bar-"))
+(register-definition-prefixes "my-tool-bar" '("my-"))
+
 
 ;;; End of scraped data
 
diff --git a/lisp/nerd-icons/nerd-icons-pkg.el b/lisp/nerd-icons/nerd-icons-pkg.el
index d5ace35a..47622b78 100644
--- a/lisp/nerd-icons/nerd-icons-pkg.el
+++ b/lisp/nerd-icons/nerd-icons-pkg.el
@@ -1,10 +1,10 @@
 ;; -*- no-byte-compile: t; lexical-binding: nil -*-
-(define-package "nerd-icons" "20250621.1548"
+(define-package "nerd-icons" "20250711.711"
   "Emacs Nerd Font Icons Library."
   '((emacs "24.3"))
   :url "https://github.com/rainstormstudio/nerd-icons.el"
-  :commit "4476b4cabe63f5efafa3c0a8b370db4f6a92e90c"
-  :revdesc "4476b4cabe63"
+  :commit "3f2757e83b9841699086f7097d23e1b3dc922cc2"
+  :revdesc "3f2757e83b98"
   :keywords '("lisp")
   :authors '(("Hongyu Ding" . "rainstormstudio@yahoo.com")
              ("Vincent Zhang" . "seagle0128@gmail.com"))
diff --git a/lisp/nerd-icons/nerd-icons.el b/lisp/nerd-icons/nerd-icons.el
index fc20c174..67a5c9b8 100644
--- a/lisp/nerd-icons/nerd-icons.el
+++ b/lisp/nerd-icons/nerd-icons.el
@@ -4,8 +4,8 @@
 
 ;; Author: Hongyu Ding <rainstormstudio@yahoo.com>, Vincent Zhang <seagle0128@gmail.com>
 ;; Keywords: lisp
-;; Package-Version: 20250621.1548
-;; Package-Revision: 4476b4cabe63
+;; Package-Version: 20250711.711
+;; Package-Revision: 3f2757e83b98
 ;; Package-Requires: ((emacs "24.3"))
 ;; URL: https://github.com/rainstormstudio/nerd-icons.el
 ;; Keywords: convenient, lisp
@@ -188,10 +188,10 @@
     ("py"             nerd-icons-devicon "nf-dev-python"         :face nerd-icons-dblue)
     ;; ("idr"         nerd-icons-devicon "idris") TODO: idris
     ("ipynb"          nerd-icons-devicon "nf-dev-jupyter"        :face nerd-icons-orange)
-    ("gem"            nerd-icons-devicon "nf-dev-ruby"           :face nerd-icons-red)
+    ("gem"            nerd-icons-codicon "nf-cod-ruby"           :face nerd-icons-red)
     ;; ("raku"        nerd-icons-devicon "raku") TODO: raku
     ;; ("rakumod"     nerd-icons-devicon "raku") TODO: raku
-    ("rb"             nerd-icons-octicon "nf-oct-ruby"           :face nerd-icons-lred)
+    ("rb"             nerd-icons-codicon "nf-cod-ruby"           :face nerd-icons-lred)
     ("rs"             nerd-icons-devicon "nf-dev-rust"           :face nerd-icons-maroon)
     ("rlib"           nerd-icons-devicon "nf-dev-rust"           :face nerd-icons-dmaroon)
     ("r"              nerd-icons-sucicon "nf-seti-r"             :face nerd-icons-lblue)
@@ -489,18 +489,18 @@
     ("^mix.lock$"              nerd-icons-sucicon "nf-seti-elixir"           :face nerd-icons-lyellow)
 
     ;; Ruby
-    ("^Gemfile\\(\\.lock\\)?$" nerd-icons-octicon "nf-oct-ruby"              :face nerd-icons-red)
-    ("_?test\\.rb$"            nerd-icons-octicon "nf-oct-ruby"              :face nerd-icons-red)
-    ("_?test_helper\\.rb$"     nerd-icons-octicon "nf-oct-ruby"              :face nerd-icons-dred)
-    ("_?spec\\.rb$"            nerd-icons-octicon "nf-oct-ruby"              :face nerd-icons-red)
-    ("_?spec_helper\\.rb$"     nerd-icons-octicon "nf-oct-ruby"              :face nerd-icons-dred)
+    ("^Gemfile\\(\\.lock\\)?$" nerd-icons-codicon "nf-cod-ruby"              :face nerd-icons-red)
+    ("_?test\\.rb$"            nerd-icons-codicon "nf-cod-ruby"              :face nerd-icons-red)
+    ("_?test_helper\\.rb$"     nerd-icons-codicon "nf-cod-ruby"              :face nerd-icons-dred)
+    ("_?spec\\.rb$"            nerd-icons-codicon "nf-cod-ruby"              :face nerd-icons-red)
+    ("_?spec_helper\\.rb$"     nerd-icons-codicon "nf-cod-ruby"              :face nerd-icons-dred)
     ;;; Cocoapods
-    ("^Podfile\\(\\.lock\\)?$" nerd-icons-octicon "nf-oct-ruby"              :face nerd-icons-red)
+    ("^Podfile\\(\\.lock\\)?$" nerd-icons-codicon "nf-cod-ruby"              :face nerd-icons-red)
     ;;; Danger
-    ("^Dangerfile\\(\\.lock\\)?$" nerd-icons-octicon "nf-oct-ruby"            :face nerd-icons-red)
+    ("^Dangerfile\\(\\.lock\\)?$" nerd-icons-codicon "nf-cod-ruby"            :face nerd-icons-red)
     ;;; Fastlane
-    ("^Appfile\\(\\.lock\\)?$" nerd-icons-octicon "nf-oct-ruby"              :face nerd-icons-red)
-    ("^Matchfile\\(\\.lock\\)?$" nerd-icons-octicon "nf-oct-ruby"            :face nerd-icons-red)
+    ("^Appfile\\(\\.lock\\)?$" nerd-icons-codicon "nf-cod-ruby"              :face nerd-icons-red)
+    ("^Matchfile\\(\\.lock\\)?$" nerd-icons-codicon "nf-cod-ruby"            :face nerd-icons-red)
 
     ("-?spec\\.ts$"            nerd-icons-mdicon "nf-md-language_typescript" :face nerd-icons-blue)
     ("-?test\\.ts$"            nerd-icons-mdicon "nf-md-language_typescript" :face nerd-icons-blue)
@@ -680,13 +680,13 @@
     (cask-mode                         nerd-icons-sucicon "nf-custom-emacs"           :face nerd-icons-blue)
     (eask-mode                         nerd-icons-sucicon "nf-custom-emacs"           :face nerd-icons-blue)
     (text-mode                         nerd-icons-faicon "nf-fa-file_text"            :face nerd-icons-cyan)
-    (enh-ruby-mode                     nerd-icons-devicon "nf-dev-ruby"               :face nerd-icons-lred)
-    (ruby-mode                         nerd-icons-devicon "nf-dev-ruby"               :face nerd-icons-lred)
-    (ruby-ts-mode                      nerd-icons-devicon "nf-dev-ruby"               :face nerd-icons-lred)
-    (inf-ruby-mode                     nerd-icons-devicon "nf-dev-ruby"               :face nerd-icons-red)
-    (projectile-rails-compilation-mode nerd-icons-devicon "nf-dev-ruby"               :face nerd-icons-red)
-    (rspec-compilation-mode            nerd-icons-devicon "nf-dev-ruby"               :face nerd-icons-red)
-    (rake-compilation-mode             nerd-icons-devicon "nf-dev-ruby"               :face nerd-icons-red)
+    (enh-ruby-mode                     nerd-icons-codicon "nf-cod-ruby"               :face nerd-icons-lred)
+    (ruby-mode                         nerd-icons-codicon "nf-cod-ruby"               :face nerd-icons-lred)
+    (ruby-ts-mode                      nerd-icons-codicon "nf-cod-ruby"               :face nerd-icons-lred)
+    (inf-ruby-mode                     nerd-icons-codicon "nf-cod-ruby"               :face nerd-icons-red)
+    (projectile-rails-compilation-mode nerd-icons-codicon "nf-cod-ruby"               :face nerd-icons-red)
+    (rspec-compilation-mode            nerd-icons-codicon "nf-cod-ruby"               :face nerd-icons-red)
+    (rake-compilation-mode             nerd-icons-codicon "nf-cod-ruby"               :face nerd-icons-red)
     (sh-mode                           nerd-icons-devicon "nf-dev-terminal"           :face nerd-icons-purple)
     (bash-ts-mode                      nerd-icons-devicon "nf-dev-terminal"           :face nerd-icons-purple)
     (shell-mode                        nerd-icons-devicon "nf-dev-terminal"           :face nerd-icons-purple)
@@ -694,8 +694,8 @@
     (bat-mode                          nerd-icons-codicon "nf-cod-terminal_cmd"       :face nerd-icons-lsilver)
     (nginx-mode                        nerd-icons-devicon "nf-dev-nginx"              :face nerd-icons-dgreen)
     (apache-mode                       nerd-icons-devicon "nf-dev-apache"             :face nerd-icons-dgreen)
-    (makefile-mode                     nerd-icons-devicon "nf-dev-gnu"                :face nerd-icons-dorange)
-    (makefile-ts-mode                  nerd-icons-devicon "nf-dev-gnu"                :face nerd-icons-dorange)
+    (makefile-mode                     nerd-icons-sucicon "nf-seti-makefile"          :face nerd-icons-dorange)
+    (makefile-ts-mode                  nerd-icons-sucicon "nf-seti-makefile"          :face nerd-icons-dorange)
     ;; (cmake-mode                     nerd-icons-fileicon "cmake"                    :face nerd-icons-red)
     ;; (cmake-ts-mode                  nerd-icons-fileicon "cmake"                    :face nerd-icons-red)
     (dockerfile-mode                   nerd-icons-sucicon "nf-seti-docker"            :face nerd-icons-blue)
@@ -728,8 +728,8 @@
     (graphql-mode                      nerd-icons-sucicon "nf-seti-graphql"           :face nerd-icons-dpink)
     (matlab-mode                       nerd-icons-devicon "nf-dev-matlab"             :face nerd-icons-orange)
     (nix-mode                          nerd-icons-mdicon  "nf-md-nix"                 :face nerd-icons-blue)
-    (perl-mode                         nerd-icons-devicon "nf-dev-perl"               :face nerd-icons-lorange)
-    (cperl-mode                        nerd-icons-devicon "nf-dev-perl"               :face nerd-icons-lorange)
+    (perl-mode                         nerd-icons-sucicon "nf-seti-perl"              :face nerd-icons-lorange)
+    (cperl-mode                        nerd-icons-sucicon "nf-seti-perl"              :face nerd-icons-lorange)
     (php-mode                          nerd-icons-devicon "nf-dev-php"                :face nerd-icons-lsilver)
     (php-ts-mode                       nerd-icons-devicon "nf-dev-php"                :face nerd-icons-lsilver)
     (prolog-mode                       nerd-icons-devicon "nf-dev-prolog"             :face nerd-icons-lmaroon)
@@ -897,7 +897,8 @@
     (ement-room-list-mode              nerd-icons-faicon "nf-fa-list"                 :face nerd-icons-dpurple)
     (ement-tabulated-room-list-mode    nerd-icons-faicon "nf-fa-table"                :face nerd-icons-dpurple)
     (ement-room-mode                   nerd-icons-faicon "nf-fa-comments_o"           :face nerd-icons-dpurple)
-    (ement-notifications-mode          nerd-icons-faicon "nf-fa-inbox"                :face nerd-icons-dpurple)))
+    (ement-notifications-mode          nerd-icons-faicon "nf-fa-inbox"                :face nerd-icons-dpurple)
+    (authinfo-mode                     nerd-icons-octicon "nf-oct-key"                :face nerd-icons-lblue)))
 
 (defvar nerd-icons-url-alist
   '(
@@ -1131,7 +1132,7 @@ inserting functions."
          (icon (or (and ext
                         (cdr (assoc (downcase ext)
                                     nerd-icons-extension-icon-alist)))
-                   (nerd-icons-match-to-alist name nerd-icons-regexp-icon-alist)                   
+                   (nerd-icons-match-to-alist name nerd-icons-regexp-icon-alist)
                    nerd-icons-default-file-icon))
          (args (cdr icon)))
     (when arg-overrides (setq args (append `(,(car args)) arg-overrides (cdr args))))
diff --git a/lisp/spacemacs-theme/spacemacs-theme-pkg.el b/lisp/spacemacs-theme/spacemacs-theme-pkg.el
index 81a69dfa..fad8c71b 100644
--- a/lisp/spacemacs-theme/spacemacs-theme-pkg.el
+++ b/lisp/spacemacs-theme/spacemacs-theme-pkg.el
@@ -1,7 +1,7 @@
 ;; -*- no-byte-compile: t; lexical-binding: nil -*-
 (define-package "spacemacs-theme" "20250613.2113"
   "Color theme with a dark and light versions."
-  '((emacs "24"))
+  ()
   :url "https://github.com/nashamri/spacemacs-theme"
   :commit "2ffca41e6e9aa55d8de5c40c6fb61e0d47763b5d"
   :revdesc "2ffca41e6e9a"
diff --git a/lisp/treemacs/treemacs-pkg.el b/lisp/treemacs/treemacs-pkg.el
index ad7ed7d4..1128efd9 100644
--- a/lisp/treemacs/treemacs-pkg.el
+++ b/lisp/treemacs/treemacs-pkg.el
@@ -1,5 +1,5 @@
 ;; -*- no-byte-compile: t; lexical-binding: nil -*-
-(define-package "treemacs" "20250617.1934"
+(define-package "treemacs" "20250707.2001"
   "A tree style file explorer package."
   '((emacs      "26.1")
     (cl-lib     "0.5")
@@ -11,7 +11,7 @@
     (ht         "2.2")
     (cfrs       "1.3.2"))
   :url "https://github.com/Alexander-Miller/treemacs"
-  :commit "7109ce99853b18435a77267a15c5dd06715b54e4"
-  :revdesc "7109ce99853b"
+  :commit "246d9505edf86c25a08cfbd131c441c8d402f8c3"
+  :revdesc "246d9505edf8"
   :authors '(("Alexander Miller" . "alexanderm@web.de"))
   :maintainers '(("Alexander Miller" . "alexanderm@web.de")))
diff --git a/lisp/treemacs/treemacs-workspaces.el b/lisp/treemacs/treemacs-workspaces.el
index 38bb880d..7dc0f469 100644
--- a/lisp/treemacs/treemacs-workspaces.el
+++ b/lisp/treemacs/treemacs-workspaces.el
@@ -139,16 +139,17 @@ If no workspace is assigned to the current scope the persisted workspaces will
 be loaded and a workspace will be found based on the `current-buffer'.
 
 This function can be used with `setf'."
+  (treemacs--maybe-load-workspaces)
   (or treemacs-override-workspace
-      (-if-let (shelf (treemacs-current-scope-shelf))
-          (treemacs-scope-shelf->workspace shelf)
-        (treemacs--maybe-load-workspaces)
-        (let* ((workspace (treemacs--find-workspace (buffer-file-name (current-buffer))))
-               (new-shelf (treemacs-scope-shelf->create! :workspace workspace)))
-          (setf (treemacs-current-scope-shelf) new-shelf)
-          (run-hook-with-args treemacs-workspace-first-found-functions
-                              workspace (treemacs-current-scope))
-          workspace))))
+      (let* ((shelf (treemacs-current-scope-shelf))
+             (workspace (and shelf (treemacs-scope-shelf->workspace shelf))))
+        (or workspace
+            (let* ((workspace (treemacs--find-workspace (buffer-file-name (current-buffer))))
+                   (new-shelf (treemacs-scope-shelf->create! :workspace workspace)))
+              (setf (treemacs-current-scope-shelf) new-shelf)
+              (run-hook-with-args treemacs-workspace-first-found-functions
+                                  workspace (treemacs-current-scope))
+              workspace)))))
 
 (gv-define-setter treemacs-current-workspace (val)
   `(let ((shelf (treemacs-current-scope-shelf)))
diff --git a/lisp/treemacs/treemacs.el b/lisp/treemacs/treemacs.el
index 99ce4325..3d354c10 100644
--- a/lisp/treemacs/treemacs.el
+++ b/lisp/treemacs/treemacs.el
@@ -5,8 +5,8 @@
 ;; Author: Alexander Miller <alexanderm@web.de>
 ;; Package-Requires: ((emacs "26.1") (cl-lib "0.5") (dash "2.11.0") (s "1.12.0") (ace-window "0.9.0") (pfuture "1.7") (hydra "0.13.2") (ht "2.2") (cfrs "1.3.2"))
 ;; Homepage: https://github.com/Alexander-Miller/treemacs
-;; Package-Version: 20250617.1934
-;; Package-Revision: 7109ce99853b
+;; Package-Version: 20250707.2001
+;; Package-Revision: 246d9505edf8
 
 ;; This program is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by