From 7c5a3978f424ebc0e6f58dedf34e46142d3b55bc Mon Sep 17 00:00:00 2001 From: Andreas Gerler Date: Tue, 20 Aug 2024 15:48:22 +0200 Subject: [PATCH] update magit and git-commit Signed-off-by: Andreas Gerler --- .../git-commit-autoloads.el | 0 .../git-commit-pkg.el | 10 +- .../git-commit.el | 21 +- .../AUTHORS.md | 4 + .../LICENSE | 0 .../dir | 0 .../git-rebase.el | 0 .../magit-apply.el | 2 +- .../magit-autoloads.el | 2 +- .../magit-autorevert.el | 0 .../magit-base.el | 0 .../magit-bisect.el | 0 .../magit-blame.el | 0 .../magit-bookmark.el | 0 .../magit-branch.el | 0 .../magit-bundle.el | 0 .../magit-clone.el | 0 .../magit-commit.el | 0 .../magit-core.el | 0 .../magit-diff.el | 2 +- .../magit-ediff.el | 0 .../magit-extras.el | 0 .../magit-fetch.el | 0 .../magit-files.el | 0 .../magit-git.el | 17 +- .../magit-gitignore.el | 0 .../magit-log.el | 10 +- .../magit-margin.el | 0 .../magit-merge.el | 0 .../magit-mode.el | 0 .../magit-notes.el | 0 .../magit-patch.el | 0 .../magit-pkg.el | 17 +- .../magit-process.el | 22 +- .../magit-pull.el | 0 .../magit-push.el | 0 .../magit-reflog.el | 0 .../magit-refs.el | 0 .../magit-remote.el | 0 .../magit-repos.el | 6 +- .../magit-reset.el | 0 .../magit-sequence.el | 0 .../magit-sparse-checkout.el | 0 .../magit-stash.el | 0 .../magit-status.el | 0 .../magit-submodule.el | 18 +- .../magit-subtree.el | 0 .../magit-tag.el | 0 .../magit-transient.el | 0 .../magit-wip.el | 0 .../magit-worktree.el | 0 .../magit.el | 10 +- .../magit.info | 383 +++++++++--------- 53 files changed, 257 insertions(+), 267 deletions(-) rename elpa/{git-commit-20240520.1135 => git-commit-20240730.1355}/git-commit-autoloads.el (100%) rename elpa/{git-commit-20240520.1135 => git-commit-20240730.1355}/git-commit-pkg.el (67%) rename elpa/{git-commit-20240520.1135 => git-commit-20240730.1355}/git-commit.el (98%) rename elpa/{magit-20240730.1741 => magit-20240820.56}/AUTHORS.md (99%) rename elpa/{magit-20240730.1741 => magit-20240820.56}/LICENSE (100%) rename elpa/{magit-20240730.1741 => magit-20240820.56}/dir (100%) rename elpa/{magit-20240730.1741 => magit-20240820.56}/git-rebase.el (100%) rename elpa/{magit-20240730.1741 => magit-20240820.56}/magit-apply.el (99%) rename elpa/{magit-20240730.1741 => magit-20240820.56}/magit-autoloads.el (99%) rename elpa/{magit-20240730.1741 => magit-20240820.56}/magit-autorevert.el (100%) rename elpa/{magit-20240730.1741 => magit-20240820.56}/magit-base.el (100%) rename elpa/{magit-20240730.1741 => magit-20240820.56}/magit-bisect.el (100%) rename elpa/{magit-20240730.1741 => magit-20240820.56}/magit-blame.el (100%) rename elpa/{magit-20240730.1741 => magit-20240820.56}/magit-bookmark.el (100%) rename elpa/{magit-20240730.1741 => magit-20240820.56}/magit-branch.el (100%) rename elpa/{magit-20240730.1741 => magit-20240820.56}/magit-bundle.el (100%) rename elpa/{magit-20240730.1741 => magit-20240820.56}/magit-clone.el (100%) rename elpa/{magit-20240730.1741 => magit-20240820.56}/magit-commit.el (100%) rename elpa/{magit-20240730.1741 => magit-20240820.56}/magit-core.el (100%) rename elpa/{magit-20240730.1741 => magit-20240820.56}/magit-diff.el (99%) rename elpa/{magit-20240730.1741 => magit-20240820.56}/magit-ediff.el (100%) rename elpa/{magit-20240730.1741 => magit-20240820.56}/magit-extras.el (100%) rename elpa/{magit-20240730.1741 => magit-20240820.56}/magit-fetch.el (100%) rename elpa/{magit-20240730.1741 => magit-20240820.56}/magit-files.el (100%) rename elpa/{magit-20240730.1741 => magit-20240820.56}/magit-git.el (99%) rename elpa/{magit-20240730.1741 => magit-20240820.56}/magit-gitignore.el (100%) rename elpa/{magit-20240730.1741 => magit-20240820.56}/magit-log.el (99%) rename elpa/{magit-20240730.1741 => magit-20240820.56}/magit-margin.el (100%) rename elpa/{magit-20240730.1741 => magit-20240820.56}/magit-merge.el (100%) rename elpa/{magit-20240730.1741 => magit-20240820.56}/magit-mode.el (100%) rename elpa/{magit-20240730.1741 => magit-20240820.56}/magit-notes.el (100%) rename elpa/{magit-20240730.1741 => magit-20240820.56}/magit-patch.el (100%) rename elpa/{magit-20240730.1741 => magit-20240820.56}/magit-pkg.el (50%) rename elpa/{magit-20240730.1741 => magit-20240820.56}/magit-process.el (98%) rename elpa/{magit-20240730.1741 => magit-20240820.56}/magit-pull.el (100%) rename elpa/{magit-20240730.1741 => magit-20240820.56}/magit-push.el (100%) rename elpa/{magit-20240730.1741 => magit-20240820.56}/magit-reflog.el (100%) rename elpa/{magit-20240730.1741 => magit-20240820.56}/magit-refs.el (100%) rename elpa/{magit-20240730.1741 => magit-20240820.56}/magit-remote.el (100%) rename elpa/{magit-20240730.1741 => magit-20240820.56}/magit-repos.el (99%) rename elpa/{magit-20240730.1741 => magit-20240820.56}/magit-reset.el (100%) rename elpa/{magit-20240730.1741 => magit-20240820.56}/magit-sequence.el (100%) rename elpa/{magit-20240730.1741 => magit-20240820.56}/magit-sparse-checkout.el (100%) rename elpa/{magit-20240730.1741 => magit-20240820.56}/magit-stash.el (100%) rename elpa/{magit-20240730.1741 => magit-20240820.56}/magit-status.el (100%) rename elpa/{magit-20240730.1741 => magit-20240820.56}/magit-submodule.el (99%) rename elpa/{magit-20240730.1741 => magit-20240820.56}/magit-subtree.el (100%) rename elpa/{magit-20240730.1741 => magit-20240820.56}/magit-tag.el (100%) rename elpa/{magit-20240730.1741 => magit-20240820.56}/magit-transient.el (100%) rename elpa/{magit-20240730.1741 => magit-20240820.56}/magit-wip.el (100%) rename elpa/{magit-20240730.1741 => magit-20240820.56}/magit-worktree.el (100%) rename elpa/{magit-20240730.1741 => magit-20240820.56}/magit.el (99%) rename elpa/{magit-20240730.1741 => magit-20240820.56}/magit.info (98%) diff --git a/elpa/git-commit-20240520.1135/git-commit-autoloads.el b/elpa/git-commit-20240730.1355/git-commit-autoloads.el similarity index 100% rename from elpa/git-commit-20240520.1135/git-commit-autoloads.el rename to elpa/git-commit-20240730.1355/git-commit-autoloads.el diff --git a/elpa/git-commit-20240520.1135/git-commit-pkg.el b/elpa/git-commit-20240730.1355/git-commit-pkg.el similarity index 67% rename from elpa/git-commit-20240520.1135/git-commit-pkg.el rename to elpa/git-commit-20240730.1355/git-commit-pkg.el index 81480580..aaa5f8ae 100644 --- a/elpa/git-commit-20240520.1135/git-commit-pkg.el +++ b/elpa/git-commit-20240730.1355/git-commit-pkg.el @@ -1,9 +1,9 @@ -(define-package "git-commit" "20240520.1135" "Edit Git commit messages." +(define-package "git-commit" "20240730.1355" "Edit Git commit messages." '((emacs "26.1") - (compat "29.1.4.5") - (transient "20240421") - (with-editor "20240415")) - :commit "22fd8f8594202a0679ccc2f7d02bca44d48b8039" :authors + (compat "30.0.0.0") + (transient "20240629") + (with-editor "20240702")) + :commit "57e6a2404070241a3fc9c4f18fd0c40b89075be2" :authors '(("Jonas Bernoulli" . "emacs.magit@jonas.bernoulli.dev") ("Sebastian Wiesner" . "lunaryorn@gmail.com") ("Florian Ragwitz" . "rafl@debian.org") diff --git a/elpa/git-commit-20240520.1135/git-commit.el b/elpa/git-commit-20240730.1355/git-commit.el similarity index 98% rename from elpa/git-commit-20240520.1135/git-commit.el rename to elpa/git-commit-20240730.1355/git-commit.el index 717ea7bb..9aeb901a 100644 --- a/elpa/git-commit-20240520.1135/git-commit.el +++ b/elpa/git-commit-20240730.1355/git-commit.el @@ -14,10 +14,10 @@ ;; Package-Version: 3.3.0.50-git ;; Package-Requires: ( ;; (emacs "26.1") -;; (compat "29.1.4.5") +;; (compat "30.0.0.0") ;; (seq "2.24") -;; (transient "0.6.0") -;; (with-editor "3.3.2")) +;; (transient "0.7.2") +;; (with-editor "3.3.4")) ;; SPDX-License-Identifier: GPL-3.0-or-later @@ -697,7 +697,7 @@ used." (defun git-commit-ensure-comment-gap () "Separate initial empty line from initial comment. If the buffer begins with an empty line followed by a comment, insert -an additional newline inbetween, so that once the users start typing, +an additional newline in between, so that once the users start typing, the input isn't tacked to the comment." (save-excursion (goto-char (point-min)) @@ -1235,9 +1235,8 @@ Added to `font-lock-extend-region-functions'." ;; because in repositories have thousands of ;; branches that would be very slow. See #4353. (format "\\(\\(?:%s\\)\\|\\)\\([^']+\\)" - (mapconcat #'identity - (magit-list-local-branch-names) - "\\|"))) + (string-join (magit-list-local-branch-names) + "\\|"))) "\\([^']*\\)")) (setq-local font-lock-multiline t) (add-hook 'font-lock-extend-region-functions @@ -1260,11 +1259,9 @@ Added to `font-lock-extend-region-functions'." (delete-region (point) (point-max))))) (let ((diff-default-read-only nil)) (diff-mode)) - (let (font-lock-verbose font-lock-support-mode) - (if (fboundp 'font-lock-ensure) - (font-lock-ensure) - (with-no-warnings - (font-lock-fontify-buffer)))) + (let ((font-lock-verbose nil) + (font-lock-support-mode nil)) + (font-lock-ensure)) (let ((pos (point-min))) (while-let ((next (next-single-property-change pos 'face))) (put-text-property pos next 'font-lock-face diff --git a/elpa/magit-20240730.1741/AUTHORS.md b/elpa/magit-20240820.56/AUTHORS.md similarity index 99% rename from elpa/magit-20240730.1741/AUTHORS.md rename to elpa/magit-20240820.56/AUTHORS.md index 31c3b18b..15c67bab 100644 --- a/elpa/magit-20240730.1741/AUTHORS.md +++ b/elpa/magit-20240820.56/AUTHORS.md @@ -177,10 +177,12 @@ All Contributors - Ivan Brennan - Jan Tatarik - Jasper St. Pierre +- JD Smith - Jean-Louis Giordano - Jeff Bellegarde - Jeff Dairiki - Jeremy Meng +- Jeremy Sowden - Jesse Alama - Jim Blandy - Joakim Jalap @@ -253,6 +255,7 @@ All Contributors - Markus Beppler - Martin Joerg - Martin Polden +- Matt Beshara - Matthew Fluet - Matthew Kraai - Matthieu Hauglustaine @@ -310,6 +313,7 @@ All Contributors - Pieter Praet - Pieter van Oostrum - Prathamesh Sonpatki +- Pratyush Yadav - Pritam Baral - rabio - Radon Rosborough diff --git a/elpa/magit-20240730.1741/LICENSE b/elpa/magit-20240820.56/LICENSE similarity index 100% rename from elpa/magit-20240730.1741/LICENSE rename to elpa/magit-20240820.56/LICENSE diff --git a/elpa/magit-20240730.1741/dir b/elpa/magit-20240820.56/dir similarity index 100% rename from elpa/magit-20240730.1741/dir rename to elpa/magit-20240820.56/dir diff --git a/elpa/magit-20240730.1741/git-rebase.el b/elpa/magit-20240820.56/git-rebase.el similarity index 100% rename from elpa/magit-20240730.1741/git-rebase.el rename to elpa/magit-20240820.56/git-rebase.el diff --git a/elpa/magit-20240730.1741/magit-apply.el b/elpa/magit-20240820.56/magit-apply.el similarity index 99% rename from elpa/magit-20240730.1741/magit-apply.el rename to elpa/magit-20240820.56/magit-apply.el index 7ad55e14..861d781a 100644 --- a/elpa/magit-20240730.1741/magit-apply.el +++ b/elpa/magit-20240820.56/magit-apply.el @@ -783,7 +783,7 @@ a separate commit. A typical workflow would be: 1. Visit the `HEAD' commit and navigate to the change that should not have been included in that commit. 2. Type \"u\" (`magit-unstage') to reverse it in the index. - This assumes that `magit-unstage-committed-changes' is non-nil. + This assumes that `magit-unstage-committed' is non-nil. 3. Type \"c e\" to extend `HEAD' with the staged changes, including those that were already staged before. 4. Optionally stage the remaining changes using \"s\" or \"S\" diff --git a/elpa/magit-20240730.1741/magit-autoloads.el b/elpa/magit-20240820.56/magit-autoloads.el similarity index 99% rename from elpa/magit-20240730.1741/magit-autoloads.el rename to elpa/magit-20240820.56/magit-autoloads.el index fa8c5fb1..5d390dbd 100644 --- a/elpa/magit-20240730.1741/magit-autoloads.el +++ b/elpa/magit-20240820.56/magit-autoloads.el @@ -1354,7 +1354,7 @@ is asked to pull. START has to be reachable from that commit. ;;; Generated autoloads from magit-process.el -(register-definition-prefixes "magit-process" '("magit-" "tramp-sh-handle-")) +(register-definition-prefixes "magit-process" '("magit-")) ;;; Generated autoloads from magit-pull.el diff --git a/elpa/magit-20240730.1741/magit-autorevert.el b/elpa/magit-20240820.56/magit-autorevert.el similarity index 100% rename from elpa/magit-20240730.1741/magit-autorevert.el rename to elpa/magit-20240820.56/magit-autorevert.el diff --git a/elpa/magit-20240730.1741/magit-base.el b/elpa/magit-20240820.56/magit-base.el similarity index 100% rename from elpa/magit-20240730.1741/magit-base.el rename to elpa/magit-20240820.56/magit-base.el diff --git a/elpa/magit-20240730.1741/magit-bisect.el b/elpa/magit-20240820.56/magit-bisect.el similarity index 100% rename from elpa/magit-20240730.1741/magit-bisect.el rename to elpa/magit-20240820.56/magit-bisect.el diff --git a/elpa/magit-20240730.1741/magit-blame.el b/elpa/magit-20240820.56/magit-blame.el similarity index 100% rename from elpa/magit-20240730.1741/magit-blame.el rename to elpa/magit-20240820.56/magit-blame.el diff --git a/elpa/magit-20240730.1741/magit-bookmark.el b/elpa/magit-20240820.56/magit-bookmark.el similarity index 100% rename from elpa/magit-20240730.1741/magit-bookmark.el rename to elpa/magit-20240820.56/magit-bookmark.el diff --git a/elpa/magit-20240730.1741/magit-branch.el b/elpa/magit-20240820.56/magit-branch.el similarity index 100% rename from elpa/magit-20240730.1741/magit-branch.el rename to elpa/magit-20240820.56/magit-branch.el diff --git a/elpa/magit-20240730.1741/magit-bundle.el b/elpa/magit-20240820.56/magit-bundle.el similarity index 100% rename from elpa/magit-20240730.1741/magit-bundle.el rename to elpa/magit-20240820.56/magit-bundle.el diff --git a/elpa/magit-20240730.1741/magit-clone.el b/elpa/magit-20240820.56/magit-clone.el similarity index 100% rename from elpa/magit-20240730.1741/magit-clone.el rename to elpa/magit-20240820.56/magit-clone.el diff --git a/elpa/magit-20240730.1741/magit-commit.el b/elpa/magit-20240820.56/magit-commit.el similarity index 100% rename from elpa/magit-20240730.1741/magit-commit.el rename to elpa/magit-20240820.56/magit-commit.el diff --git a/elpa/magit-20240730.1741/magit-core.el b/elpa/magit-20240820.56/magit-core.el similarity index 100% rename from elpa/magit-20240730.1741/magit-core.el rename to elpa/magit-20240820.56/magit-core.el diff --git a/elpa/magit-20240730.1741/magit-diff.el b/elpa/magit-20240820.56/magit-diff.el similarity index 99% rename from elpa/magit-20240730.1741/magit-diff.el rename to elpa/magit-20240820.56/magit-diff.el index 5ad87868..5aeba13c 100644 --- a/elpa/magit-20240730.1741/magit-diff.el +++ b/elpa/magit-20240820.56/magit-diff.el @@ -1235,7 +1235,7 @@ a commit read from the minibuffer." (cons (and current-prefix-arg (magit-read-branch-or-commit "Diff working tree and commit")) (magit-diff-arguments))) - (magit-diff-setup-buffer (or rev "HEAD") nil args files 'unstaged)) + (magit-diff-setup-buffer (or rev "HEAD") nil args files 'committed)) ;;;###autoload (defun magit-diff-staged (&optional rev args files) diff --git a/elpa/magit-20240730.1741/magit-ediff.el b/elpa/magit-20240820.56/magit-ediff.el similarity index 100% rename from elpa/magit-20240730.1741/magit-ediff.el rename to elpa/magit-20240820.56/magit-ediff.el diff --git a/elpa/magit-20240730.1741/magit-extras.el b/elpa/magit-20240820.56/magit-extras.el similarity index 100% rename from elpa/magit-20240730.1741/magit-extras.el rename to elpa/magit-20240820.56/magit-extras.el diff --git a/elpa/magit-20240730.1741/magit-fetch.el b/elpa/magit-20240820.56/magit-fetch.el similarity index 100% rename from elpa/magit-20240730.1741/magit-fetch.el rename to elpa/magit-20240820.56/magit-fetch.el diff --git a/elpa/magit-20240730.1741/magit-files.el b/elpa/magit-20240820.56/magit-files.el similarity index 100% rename from elpa/magit-20240730.1741/magit-files.el rename to elpa/magit-20240820.56/magit-files.el diff --git a/elpa/magit-20240730.1741/magit-git.el b/elpa/magit-20240820.56/magit-git.el similarity index 99% rename from elpa/magit-20240730.1741/magit-git.el rename to elpa/magit-20240820.56/magit-git.el index 58004304..8e14df4d 100644 --- a/elpa/magit-20240730.1741/magit-git.el +++ b/elpa/magit-20240820.56/magit-git.el @@ -740,7 +740,7 @@ See info node `(magit)Debugging Tools' for more information." (key (string-join keys "."))) (if (and magit--refresh-cache (not arg)) (magit-config-get-from-cached-list key) - (magit-git-items "config" arg "-z" "--get-all" key)))) + (magit-git-items "config" arg "-z" "--get-all" "--include" key)))) (defun magit-get-boolean (&rest keys) "Return the boolean value of the Git variable specified by KEYS. @@ -751,7 +751,7 @@ Also see `magit-git-config-p'." (key (string-join keys "."))) (equal (if magit--refresh-cache (car (last (magit-config-get-from-cached-list key))) - (magit-git-str "config" arg "--bool" key)) + (magit-git-str "config" arg "--bool" "--include" key)) "true"))) (defun magit-set (value &rest keys) @@ -2421,8 +2421,6 @@ and this option only controls what face is used.") (point-min) (point-max) buffer-file-name t nil nil t) ,@body))) -(defvar magit-tramp-process-environment nil) - (defmacro magit-with-temp-index (tree arg &rest body) (declare (indent 2) (debug (form form body))) (let ((file (cl-gensym "file"))) @@ -2436,13 +2434,8 @@ and this option only controls what face is used.") (unless (magit-git-success "read-tree" ,arg tree (concat "--index-output=" ,file)) (error "Cannot read tree %s" tree))) - (if (file-remote-p default-directory) - (let ((magit-tramp-process-environment - (cons (concat "GIT_INDEX_FILE=" ,file) - magit-tramp-process-environment))) - ,@body) - (with-environment-variables (("GIT_INDEX_FILE" ,file)) - ,@body))) + (with-environment-variables (("GIT_INDEX_FILE" ,file)) + ,@body)) (ignore-errors (delete-file (concat (file-remote-p default-directory) ,file))))))) @@ -2652,7 +2645,7 @@ and this option only controls what face is used.") prompt (cl-union (and local-branch (if remote - (concat remote "/" local-branch) + (list local-branch) (--map (concat it "/" local-branch) (magit-list-remotes)))) (magit-list-remote-branch-names remote t) diff --git a/elpa/magit-20240730.1741/magit-gitignore.el b/elpa/magit-20240820.56/magit-gitignore.el similarity index 100% rename from elpa/magit-20240730.1741/magit-gitignore.el rename to elpa/magit-20240820.56/magit-gitignore.el diff --git a/elpa/magit-20240730.1741/magit-log.el b/elpa/magit-20240820.56/magit-log.el similarity index 99% rename from elpa/magit-20240730.1741/magit-log.el rename to elpa/magit-20240820.56/magit-log.el index c50eb4d0..f2a70ca2 100644 --- a/elpa/magit-20240730.1741/magit-log.el +++ b/elpa/magit-20240820.56/magit-log.el @@ -1725,8 +1725,14 @@ Type \\[magit-log-select-quit] to abort without selecting a commit." (append args (car (magit-log--get-value 'magit-log-select-mode magit-direct-use-buffer-arguments)))) - (when initial - (magit-log-goto-commit-section initial)) + (if initial + (magit-log-goto-commit-section initial) + (while-let ((rev (magit-section-value-if 'commit)) + ((string-match-p "\\`\\(fixup\\|squash\\)!" + (magit-rev-format "%s" rev))) + (section (magit-current-section)) + (next (car (magit-section-siblings section 'next)))) + (magit-section-goto next))) (setq magit-log-select-pick-function pick) (setq magit-log-select-quit-function quit) (when magit-log-select-show-usage diff --git a/elpa/magit-20240730.1741/magit-margin.el b/elpa/magit-20240820.56/magit-margin.el similarity index 100% rename from elpa/magit-20240730.1741/magit-margin.el rename to elpa/magit-20240820.56/magit-margin.el diff --git a/elpa/magit-20240730.1741/magit-merge.el b/elpa/magit-20240820.56/magit-merge.el similarity index 100% rename from elpa/magit-20240730.1741/magit-merge.el rename to elpa/magit-20240820.56/magit-merge.el diff --git a/elpa/magit-20240730.1741/magit-mode.el b/elpa/magit-20240820.56/magit-mode.el similarity index 100% rename from elpa/magit-20240730.1741/magit-mode.el rename to elpa/magit-20240820.56/magit-mode.el diff --git a/elpa/magit-20240730.1741/magit-notes.el b/elpa/magit-20240820.56/magit-notes.el similarity index 100% rename from elpa/magit-20240730.1741/magit-notes.el rename to elpa/magit-20240820.56/magit-notes.el diff --git a/elpa/magit-20240730.1741/magit-patch.el b/elpa/magit-20240820.56/magit-patch.el similarity index 100% rename from elpa/magit-20240730.1741/magit-patch.el rename to elpa/magit-20240820.56/magit-patch.el diff --git a/elpa/magit-20240730.1741/magit-pkg.el b/elpa/magit-20240820.56/magit-pkg.el similarity index 50% rename from elpa/magit-20240730.1741/magit-pkg.el rename to elpa/magit-20240820.56/magit-pkg.el index 8cb83dac..7a062fb0 100644 --- a/elpa/magit-20240730.1741/magit-pkg.el +++ b/elpa/magit-20240820.56/magit-pkg.el @@ -1,15 +1,18 @@ -(define-package "magit" "20240730.1741" "A Git porcelain inside Emacs." +(define-package "magit" "20240820.56" "A Git porcelain inside Emacs" '((emacs "26.1") (compat "30.0.0.0") - (dash "20240510") - (git-commit "20240623") - (magit-section "20240710") + (dash "2.19.1") + (git-commit "4.0.0") + (magit-section "4.0.0") (seq "2.24") - (transient "20240629") - (with-editor "20240702")) - :commit "d9ff4e8b3a8203454bfcbedfbac378a80cd6c8fe" :authors + (transient "0.7.4") + (with-editor "3.4.1")) + :commit "d7523a80804ac1ee13cc9a923b214c4652ebecd0" :authors '(("Marius Vollmer" . "marius.vollmer@gmail.com") ("Jonas Bernoulli" . "emacs.magit@jonas.bernoulli.dev")) + :maintainers + '(("Jonas Bernoulli" . "emacs.magit@jonas.bernoulli.dev") + ("Kyle Meyer" . "kyle@kyleam.com")) :maintainer '("Jonas Bernoulli" . "emacs.magit@jonas.bernoulli.dev") :keywords diff --git a/elpa/magit-20240730.1741/magit-process.el b/elpa/magit-20240820.56/magit-process.el similarity index 98% rename from elpa/magit-20240730.1741/magit-process.el rename to elpa/magit-20240820.56/magit-process.el index ae2bf1fb..e80d9926 100644 --- a/elpa/magit-20240730.1741/magit-process.el +++ b/elpa/magit-20240820.56/magit-process.el @@ -451,8 +451,7 @@ conversion." (defun magit-process-environment () ;; The various w32 hacks are only applicable when running on the local ;; machine. A local binding of process-environment different from the - ;; top-level value affects the environment used in - ;; tramp-sh-handle-{start-file-process,process-file}. + ;; top-level value affects the environment used by Tramp. (let ((local (not (file-remote-p default-directory)))) (append magit-git-environment (and local @@ -1019,25 +1018,6 @@ as argument." (add-hook 'magit-credential-hook #'magit-maybe-start-credential-cache-daemon) -(define-advice tramp-sh-handle-start-file-process - (:around (fn name buffer program &rest args) - magit-tramp-process-environment) - (if magit-tramp-process-environment - (apply fn name buffer - (car magit-tramp-process-environment) - (append (cdr magit-tramp-process-environment) - (cons program args))) - (apply fn name buffer program args))) - -(define-advice tramp-sh-handle-process-file - (:around (fn program &optional infile destination display &rest args) - magit-tramp-process-environment) - (if magit-tramp-process-environment - (apply fn "env" infile destination display - (append magit-tramp-process-environment - (cons program args))) - (apply fn program infile destination display args))) - (defvar-keymap magit-mode-line-process-map :doc "Keymap for `mode-line-process'." " " 'magit-process-buffer) diff --git a/elpa/magit-20240730.1741/magit-pull.el b/elpa/magit-20240820.56/magit-pull.el similarity index 100% rename from elpa/magit-20240730.1741/magit-pull.el rename to elpa/magit-20240820.56/magit-pull.el diff --git a/elpa/magit-20240730.1741/magit-push.el b/elpa/magit-20240820.56/magit-push.el similarity index 100% rename from elpa/magit-20240730.1741/magit-push.el rename to elpa/magit-20240820.56/magit-push.el diff --git a/elpa/magit-20240730.1741/magit-reflog.el b/elpa/magit-20240820.56/magit-reflog.el similarity index 100% rename from elpa/magit-20240730.1741/magit-reflog.el rename to elpa/magit-20240820.56/magit-reflog.el diff --git a/elpa/magit-20240730.1741/magit-refs.el b/elpa/magit-20240820.56/magit-refs.el similarity index 100% rename from elpa/magit-20240730.1741/magit-refs.el rename to elpa/magit-20240820.56/magit-refs.el diff --git a/elpa/magit-20240730.1741/magit-remote.el b/elpa/magit-20240820.56/magit-remote.el similarity index 100% rename from elpa/magit-20240730.1741/magit-remote.el rename to elpa/magit-20240820.56/magit-remote.el diff --git a/elpa/magit-20240730.1741/magit-repos.el b/elpa/magit-20240820.56/magit-repos.el similarity index 99% rename from elpa/magit-20240730.1741/magit-repos.el rename to elpa/magit-20240820.56/magit-repos.el index aed56e3c..95fbd653 100644 --- a/elpa/magit-20240730.1741/magit-repos.el +++ b/elpa/magit-20240820.56/magit-repos.el @@ -65,7 +65,8 @@ This option controls which repositories are being listed by :options '(hl-line-mode)) (defcustom magit-repolist-columns - '(("Name" 25 magit-repolist-column-ident nil) + '(("Name" 25 magit-repolist-column-ident + ()) ("Version" 25 magit-repolist-column-version ((:sort magit-repolist-version<))) ("BU" 3 magit-repolist-column-unpushed-to-upstream + ("Branch" 20 magit-repolist-column-branch + ()) + ("BP" 3 magit-repolist-column-unpushed-to-pushremote ((:right-align t) (:sort <))) - ("B" 3 magit-repolist-column-branches + ("B>U" 3 magit-repolist-column-unpushed-to-upstream ((:right-align t) (:sort <))) ("S" 3 magit-repolist-column-stashes + ((:right-align t) + (:sort <))) + ("B" 3 magit-repolist-column-branches ((:right-align t) (:sort <)))) "List of columns displayed by `magit-list-submodules'. diff --git a/elpa/magit-20240730.1741/magit-subtree.el b/elpa/magit-20240820.56/magit-subtree.el similarity index 100% rename from elpa/magit-20240730.1741/magit-subtree.el rename to elpa/magit-20240820.56/magit-subtree.el diff --git a/elpa/magit-20240730.1741/magit-tag.el b/elpa/magit-20240820.56/magit-tag.el similarity index 100% rename from elpa/magit-20240730.1741/magit-tag.el rename to elpa/magit-20240820.56/magit-tag.el diff --git a/elpa/magit-20240730.1741/magit-transient.el b/elpa/magit-20240820.56/magit-transient.el similarity index 100% rename from elpa/magit-20240730.1741/magit-transient.el rename to elpa/magit-20240820.56/magit-transient.el diff --git a/elpa/magit-20240730.1741/magit-wip.el b/elpa/magit-20240820.56/magit-wip.el similarity index 100% rename from elpa/magit-20240730.1741/magit-wip.el rename to elpa/magit-20240820.56/magit-wip.el diff --git a/elpa/magit-20240730.1741/magit-worktree.el b/elpa/magit-20240820.56/magit-worktree.el similarity index 100% rename from elpa/magit-20240730.1741/magit-worktree.el rename to elpa/magit-20240820.56/magit-worktree.el diff --git a/elpa/magit-20240730.1741/magit.el b/elpa/magit-20240820.56/magit.el similarity index 99% rename from elpa/magit-20240730.1741/magit.el rename to elpa/magit-20240820.56/magit.el index 969e5eb5..8a7696f9 100644 --- a/elpa/magit-20240730.1741/magit.el +++ b/elpa/magit-20240820.56/magit.el @@ -17,16 +17,16 @@ ;; Homepage: https://github.com/magit/magit ;; Keywords: git tools vc -;; Package-Version: 3.3.0.50-git +;; Package-Version: 4.0.0 ;; Package-Requires: ( ;; (emacs "26.1") ;; (compat "30.0.0.0") ;; (dash "2.19.1") -;; (git-commit "3.3.0") -;; (magit-section "3.3.0") +;; (git-commit "4.0.0") +;; (magit-section "4.0.0") ;; (seq "2.24") -;; (transient "0.7.2") -;; (with-editor "3.3.4")) +;; (transient "0.7.4") +;; (with-editor "3.4.1")) ;; SPDX-License-Identifier: GPL-3.0-or-later diff --git a/elpa/magit-20240730.1741/magit.info b/elpa/magit-20240820.56/magit.info similarity index 98% rename from elpa/magit-20240730.1741/magit.info rename to elpa/magit-20240820.56/magit.info index 12f0e372..000284f7 100644 --- a/elpa/magit-20240730.1741/magit.info +++ b/elpa/magit-20240820.56/magit.info @@ -32,7 +32,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 itself deserve to be called porcelains. -This manual is for Magit version 3.3.0.50-git. +This manual is for Magit v4.0.0-20-g1df14712. Copyright (C) 2015-2024 Jonas Bernoulli @@ -3047,7 +3047,9 @@ repository’s log buffer, depending on the value of Buffer Variables::). For information about the various arguments, see *note -(gitman)git-log::. The switch ‘++order=VALUE’ is converted to one of +(gitman)git-log::. + + The switch ‘++order=VALUE’ is converted to one of ‘--author-date-order’, ‘--date-order’, or ‘--topo-order’ before being passed to ‘git log’. @@ -4873,7 +4875,7 @@ apply variants are described in the next section. 2. Visit the ‘HEAD’ commit and navigate to the change that should not have been included in that commit. 3. Type ‘u’ (‘magit-unstage’) to reverse it in the index. This - assumes that ‘magit-unstage-committed-changes’ is non-nil. + assumes that ‘magit-unstage-committed’ is non-nil. 4. Type ‘c e’ to extend ‘HEAD’ with the staged changes, including those that were already staged before. 5. Optionally stage the remaining changes using ‘s’ or ‘S’ and @@ -5829,9 +5831,10 @@ e.g.: git config --global remote.autoSetupMerge always - For more information about these variables you should also see *note -(gitman)git-config::. Also see *note (gitman)git-branch::. , *note -(gitman)git-checkout::. and *note Pushing::. + For more information about these variables you should also see + + *note (gitman)git-config::. Also see *note (gitman)git-branch::. , +*note (gitman)git-checkout::. and *note Pushing::. -- User Option: magit-prefer-remote-upstream This option controls whether commands that read a branch from the @@ -10139,28 +10142,28 @@ Appendix C Keystroke Index * k <2>: Editing Rebase Sequences. (line 56) * k <3>: Stashing. (line 118) -* l: Logging. (line 28) +* l: Logging. (line 30) * L: Refreshing Logs. (line 12) * L <1>: Log Buffer. (line 7) * L <2>: Log Margin. (line 52) * l <1>: Editing Rebase Sequences. (line 94) -* l a: Logging. (line 59) -* l b: Logging. (line 56) +* l a: Logging. (line 61) +* l b: Logging. (line 58) * L d: Log Margin. (line 66) * L g: Refreshing Logs. (line 17) -* l h: Logging. (line 38) +* l h: Logging. (line 40) * l H: Reflog. (line 18) -* l l: Logging. (line 33) -* l L: Logging. (line 53) +* l l: Logging. (line 35) +* l L: Logging. (line 55) * L L: Refreshing Logs. (line 34) * L L <1>: Log Margin. (line 60) * L l: Log Margin. (line 63) -* l o: Logging. (line 47) +* l o: Logging. (line 49) * l O: Reflog. (line 15) * l r: Reflog. (line 12) * L s: Refreshing Logs. (line 21) -* l u: Logging. (line 41) +* l u: Logging. (line 43) * L w: Refreshing Logs. (line 27) * m: Repository List. (line 105) * m <1>: Merging. (line 10) @@ -10824,23 +10827,23 @@ Appendix D Function and Command Index * magit-list-repositories: Repository List. (line 6) * magit-list-submodules: Listing Submodules. (line 13) * magit-list-submodules <1>: Submodule Transient. (line 48) -* magit-log: Logging. (line 28) +* magit-log: Logging. (line 30) * magit-log <1>: Commands for Buffers Visiting Files. (line 52) * magit-log <2>: Commands for Buffers Visiting Files. (line 109) -* magit-log-all: Logging. (line 59) -* magit-log-all-branches: Logging. (line 56) -* magit-log-branches: Logging. (line 53) +* magit-log-all: Logging. (line 61) +* magit-log-all-branches: Logging. (line 58) +* magit-log-branches: Logging. (line 55) * magit-log-buffer-file: Commands for Buffers Visiting Files. (line 52) * magit-log-buffer-file <1>: Commands for Buffers Visiting Files. (line 119) * magit-log-bury-buffer: Log Buffer. (line 14) -* magit-log-current: Logging. (line 33) +* magit-log-current: Logging. (line 35) * magit-log-double-commit-limit: Log Buffer. (line 64) * magit-log-half-commit-limit: Log Buffer. (line 67) -* magit-log-head: Logging. (line 38) +* magit-log-head: Logging. (line 40) * magit-log-maybe-show-more-commits: Section Movement. (line 58) * magit-log-maybe-update-blob-buffer: Section Movement. (line 72) * magit-log-maybe-update-revision-buffer: Section Movement. (line 65) @@ -10850,11 +10853,11 @@ Appendix D Function and Command Index (line 132) * magit-log-move-to-parent: Log Buffer. (line 26) * magit-log-move-to-revision: Log Buffer. (line 31) -* magit-log-other: Logging. (line 47) +* magit-log-other: Logging. (line 49) * magit-log-refresh: Refreshing Logs. (line 12) * magit-log-refresh <1>: Refreshing Logs. (line 17) * magit-log-refresh <2>: Log Buffer. (line 7) -* magit-log-related: Logging. (line 41) +* magit-log-related: Logging. (line 43) * magit-log-save-default-arguments: Refreshing Logs. (line 27) * magit-log-select-pick: Select from Log. (line 21) * magit-log-select-quit: Select from Log. (line 26) @@ -11328,7 +11331,7 @@ Appendix E Variable Index * magit-post-display-buffer-hook: Switching Buffers. (line 85) * magit-pre-display-buffer-hook: Switching Buffers. (line 76) * magit-prefer-remote-upstream: Branch Git Variables. - (line 108) + (line 109) * magit-prefix-use-buffer-arguments: Transient Arguments and Buffer Variables. (line 65) * magit-process-extreme-logging: Viewing Git Output. (line 56) @@ -11416,173 +11419,173 @@ Appendix E Variable Index  Tag Table: Node: Top774 -Node: Introduction6566 -Node: Installation11282 -Node: Installing from Melpa11612 -Node: Installing from the Git Repository12687 -Node: Post-Installation Tasks15501 -Node: Getting Started16786 -Node: Interface Concepts22597 -Node: Modes and Buffers22976 -Node: Switching Buffers24687 -Node: Naming Buffers29426 -Node: Quitting Windows32501 -Node: Automatic Refreshing of Magit Buffers34436 -Node: Automatic Saving of File-Visiting Buffers37317 -Node: Automatic Reverting of File-Visiting Buffers38501 -Node: Risk of Reverting Automatically43486 -Node: Sections45868 -Node: Section Movement46794 -Node: Section Visibility51668 -Node: Section Hooks58355 -Node: Section Types and Values60761 -Node: Section Options62176 -Node: Transient Commands62647 -Node: Transient Arguments and Buffer Variables64123 -Node: Completion Confirmation and the Selection71140 -Node: Action Confirmation71586 -Node: Completion and Confirmation80091 -Node: The Selection83276 -Node: The hunk-internal region86174 -Node: Support for Completion Frameworks87263 -Node: Additional Completion Options92148 -Node: Mouse Support92746 -Node: Running Git93322 -Node: Viewing Git Output93567 -Node: Git Process Status96271 -Node: Running Git Manually97236 -Node: Git Executable99926 -Node: Global Git Arguments102934 -Node: Inspecting103739 -Node: Status Buffer104896 -Node: Status Sections109907 -Node: Status Header Sections115434 -Node: Status Module Sections118053 -Node: Status Options120550 -Node: Repository List121913 -Node: Logging126691 -Node: Refreshing Logs129530 -Node: Log Buffer130951 -Node: Log Margin135774 -Node: Select from Log138927 -Node: Reflog141137 -Node: Cherries142774 -Node: Diffing144612 -Node: Refreshing Diffs147646 -Node: Commands Available in Diffs151335 -Node: Diff Options153848 -Node: Revision Buffer159311 -Node: Ediffing162631 -Node: References Buffer168681 -Node: References Sections179275 -Node: Bisecting180132 -Node: Visiting Files and Blobs182443 -Node: General-Purpose Visit Commands182971 -Node: Visiting Files and Blobs from a Diff183924 -Node: Blaming187368 -Node: Manipulating194356 -Node: Creating Repository194698 -Node: Cloning Repository195235 -Node: Staging and Unstaging201676 -Node: Staging from File-Visiting Buffers205657 -Node: Applying206763 -Node: Committing208836 -Node: Initiating a Commit209419 -Node: Editing Commit Messages214609 -Node: Using the Revision Stack217382 -Node: Commit Pseudo Headers220427 -Node: Commit Mode and Hooks221722 -Node: Commit Message Conventions224580 -Node: Branching226567 -Node: The Two Remotes226793 -Node: Branch Commands229446 -Node: Branch Git Variables242296 -Node: Auxiliary Branch Commands247666 -Node: Merging248782 -Node: Resolving Conflicts252938 -Node: Rebasing258312 -Node: Editing Rebase Sequences263101 -Node: Information About In-Progress Rebase267317 -Ref: Information About In-Progress Rebase-Footnote-1276430 -Node: Cherry Picking277026 -Node: Reverting281360 -Node: Resetting282779 -Node: Stashing284605 -Node: Transferring290986 -Node: Remotes291208 -Node: Remote Commands291360 -Node: Remote Git Variables295399 -Node: Fetching296670 -Node: Pulling299153 -Node: Pushing300179 -Node: Plain Patches304470 -Node: Maildir Patches305941 -Node: Miscellaneous307420 -Node: Tagging307766 -Node: Notes309659 -Node: Submodules311994 -Node: Listing Submodules312212 -Node: Submodule Transient314360 -Node: Subtree316805 -Node: Worktree318736 -Node: Sparse checkouts319812 -Node: Bundle322588 -Node: Common Commands322963 -Node: Wip Modes325591 -Node: Wip Graph330482 -Node: Legacy Wip Modes332795 -Node: Commands for Buffers Visiting Files335682 -Node: Minor Mode for Buffers Visiting Blobs343909 -Node: Customizing344707 -Node: Per-Repository Configuration346303 -Node: Essential Settings348557 -Node: Safety348903 -Node: Performance350664 -Ref: Log Performance353627 -Ref: Diff Performance354932 -Ref: Refs Buffer Performance356273 -Ref: Committing Performance356848 -Node: Microsoft Windows Performance357830 -Node: MacOS Performance359021 -Ref: MacOS Performance-Footnote-1360044 -Node: Global Bindings360126 -Node: Plumbing362354 -Node: Calling Git363183 -Node: Getting a Value from Git364708 -Node: Calling Git for Effect368436 -Node: Section Plumbing374330 -Node: Creating Sections374558 -Node: Section Selection378454 -Node: Matching Sections380250 -Node: Refreshing Buffers386171 -Node: Conventions389315 -Node: Theming Faces389507 -Node: FAQ397612 -Node: FAQ - How to ...?398050 -Node: How to pronounce Magit?398407 -Node: How to show git's output?399210 -Node: How to install the gitman info manual?399996 -Node: How to show diffs for gpg-encrypted files?400966 -Node: How does branching and pushing work?401562 -Node: Should I disable VC?401895 -Node: FAQ - Issues and Errors402498 -Node: Magit is slow403443 -Node: I changed several thousand files at once and now Magit is unusable403736 -Node: I am having problems committing404462 -Node: I am using MS Windows and cannot push with Magit404943 -Node: I am using macOS and SOMETHING works in shell but not in Magit405561 -Node: Expanding a file to show the diff causes it to disappear406395 -Node: Point is wrong in the COMMIT_EDITMSG buffer406983 -Node: The mode-line information isn't always up-to-date408031 -Node: A branch and tag sharing the same name breaks SOMETHING409094 -Node: My Git hooks work on the command-line but not inside Magit409981 -Node: git-commit-mode isn't used when committing from the command-line410827 -Node: Point ends up inside invisible text when jumping to a file-visiting buffer413098 -Node: I am no longer able to save popup defaults413947 -Node: Debugging Tools414928 -Node: Keystroke Index418102 -Node: Function and Command Index459716 -Node: Variable Index517917 +Node: Introduction6565 +Node: Installation11281 +Node: Installing from Melpa11611 +Node: Installing from the Git Repository12686 +Node: Post-Installation Tasks15500 +Node: Getting Started16785 +Node: Interface Concepts22596 +Node: Modes and Buffers22975 +Node: Switching Buffers24686 +Node: Naming Buffers29425 +Node: Quitting Windows32500 +Node: Automatic Refreshing of Magit Buffers34435 +Node: Automatic Saving of File-Visiting Buffers37316 +Node: Automatic Reverting of File-Visiting Buffers38500 +Node: Risk of Reverting Automatically43485 +Node: Sections45867 +Node: Section Movement46793 +Node: Section Visibility51667 +Node: Section Hooks58354 +Node: Section Types and Values60760 +Node: Section Options62175 +Node: Transient Commands62646 +Node: Transient Arguments and Buffer Variables64122 +Node: Completion Confirmation and the Selection71139 +Node: Action Confirmation71585 +Node: Completion and Confirmation80090 +Node: The Selection83275 +Node: The hunk-internal region86173 +Node: Support for Completion Frameworks87262 +Node: Additional Completion Options92147 +Node: Mouse Support92745 +Node: Running Git93321 +Node: Viewing Git Output93566 +Node: Git Process Status96270 +Node: Running Git Manually97235 +Node: Git Executable99925 +Node: Global Git Arguments102933 +Node: Inspecting103738 +Node: Status Buffer104895 +Node: Status Sections109906 +Node: Status Header Sections115433 +Node: Status Module Sections118052 +Node: Status Options120549 +Node: Repository List121912 +Node: Logging126690 +Node: Refreshing Logs129532 +Node: Log Buffer130953 +Node: Log Margin135776 +Node: Select from Log138929 +Node: Reflog141139 +Node: Cherries142776 +Node: Diffing144614 +Node: Refreshing Diffs147648 +Node: Commands Available in Diffs151337 +Node: Diff Options153850 +Node: Revision Buffer159313 +Node: Ediffing162633 +Node: References Buffer168683 +Node: References Sections179277 +Node: Bisecting180134 +Node: Visiting Files and Blobs182445 +Node: General-Purpose Visit Commands182973 +Node: Visiting Files and Blobs from a Diff183926 +Node: Blaming187370 +Node: Manipulating194358 +Node: Creating Repository194700 +Node: Cloning Repository195237 +Node: Staging and Unstaging201678 +Node: Staging from File-Visiting Buffers205651 +Node: Applying206757 +Node: Committing208830 +Node: Initiating a Commit209413 +Node: Editing Commit Messages214603 +Node: Using the Revision Stack217376 +Node: Commit Pseudo Headers220421 +Node: Commit Mode and Hooks221716 +Node: Commit Message Conventions224574 +Node: Branching226561 +Node: The Two Remotes226787 +Node: Branch Commands229440 +Node: Branch Git Variables242290 +Node: Auxiliary Branch Commands247664 +Node: Merging248780 +Node: Resolving Conflicts252936 +Node: Rebasing258310 +Node: Editing Rebase Sequences263099 +Node: Information About In-Progress Rebase267315 +Ref: Information About In-Progress Rebase-Footnote-1276428 +Node: Cherry Picking277024 +Node: Reverting281358 +Node: Resetting282777 +Node: Stashing284603 +Node: Transferring290984 +Node: Remotes291206 +Node: Remote Commands291358 +Node: Remote Git Variables295397 +Node: Fetching296668 +Node: Pulling299151 +Node: Pushing300177 +Node: Plain Patches304468 +Node: Maildir Patches305939 +Node: Miscellaneous307418 +Node: Tagging307764 +Node: Notes309657 +Node: Submodules311992 +Node: Listing Submodules312210 +Node: Submodule Transient314358 +Node: Subtree316803 +Node: Worktree318734 +Node: Sparse checkouts319810 +Node: Bundle322586 +Node: Common Commands322961 +Node: Wip Modes325589 +Node: Wip Graph330480 +Node: Legacy Wip Modes332793 +Node: Commands for Buffers Visiting Files335680 +Node: Minor Mode for Buffers Visiting Blobs343907 +Node: Customizing344705 +Node: Per-Repository Configuration346301 +Node: Essential Settings348555 +Node: Safety348901 +Node: Performance350662 +Ref: Log Performance353625 +Ref: Diff Performance354930 +Ref: Refs Buffer Performance356271 +Ref: Committing Performance356846 +Node: Microsoft Windows Performance357828 +Node: MacOS Performance359019 +Ref: MacOS Performance-Footnote-1360042 +Node: Global Bindings360124 +Node: Plumbing362352 +Node: Calling Git363181 +Node: Getting a Value from Git364706 +Node: Calling Git for Effect368434 +Node: Section Plumbing374328 +Node: Creating Sections374556 +Node: Section Selection378452 +Node: Matching Sections380248 +Node: Refreshing Buffers386169 +Node: Conventions389313 +Node: Theming Faces389505 +Node: FAQ397610 +Node: FAQ - How to ...?398048 +Node: How to pronounce Magit?398405 +Node: How to show git's output?399208 +Node: How to install the gitman info manual?399994 +Node: How to show diffs for gpg-encrypted files?400964 +Node: How does branching and pushing work?401560 +Node: Should I disable VC?401893 +Node: FAQ - Issues and Errors402496 +Node: Magit is slow403441 +Node: I changed several thousand files at once and now Magit is unusable403734 +Node: I am having problems committing404460 +Node: I am using MS Windows and cannot push with Magit404941 +Node: I am using macOS and SOMETHING works in shell but not in Magit405559 +Node: Expanding a file to show the diff causes it to disappear406393 +Node: Point is wrong in the COMMIT_EDITMSG buffer406981 +Node: The mode-line information isn't always up-to-date408029 +Node: A branch and tag sharing the same name breaks SOMETHING409092 +Node: My Git hooks work on the command-line but not inside Magit409979 +Node: git-commit-mode isn't used when committing from the command-line410825 +Node: Point ends up inside invisible text when jumping to a file-visiting buffer413096 +Node: I am no longer able to save popup defaults413945 +Node: Debugging Tools414926 +Node: Keystroke Index418100 +Node: Function and Command Index459714 +Node: Variable Index517915  End Tag Table -- 2.47.3