From 917f5e25deeddc229a765c8ff3cabfb2e375e82a Mon Sep 17 00:00:00 2001 From: Sean Whitton Date: Sat, 29 Nov 2025 14:29:58 +0000 Subject: [PATCH] Fix vc-git-uncommit-revisions-from-end * lisp/vc/vc-git.el (vc-git-uncommit-revisions-from-end): Don't leave changes staged. --- lisp/vc/vc-git.el | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el index 93951c04c12..eede3955d7e 100644 --- a/lisp/vc/vc-git.el +++ b/lisp/vc/vc-git.el @@ -2340,10 +2340,10 @@ It is an error if REV is not on the current branch." (vc-git-command nil 0 nil "reset" "--hard" rev)) (defun vc-git-uncommit-revisions-from-end (rev) - "Soft reset back to REV. + "Mixed reset back to REV. It is an error if REV is not on the current branch." (vc-git--assert-revision-on-branch rev (vc-git--current-branch)) - (vc-git-command nil 0 nil "reset" "--soft" rev)) + (vc-git-command nil 0 nil "reset" "--mixed" rev)) (defvar vc-git-extra-menu-map (let ((map (make-sparse-keymap)))