mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-06 06:20:55 -08:00
Code Issues Projects Releases Wiki Activity

Fix vc-git-uncommit-revisions-from-end

Browse source 
* lisp/vc/vc-git.el (vc-git-uncommit-revisions-from-end): Don't
leave changes staged.
This commit is contained in:
Sean Whitton 2025-11-29 14:29:58 +00:00
parent 577821f143
commit 917f5e25de
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lisp/vc/vc-git.el
View file

@ -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)) (vc-git-command nil 0 nil "reset" "--hard" rev))
(defun vc-git-uncommit-revisions-from-end (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." 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--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 (defvar vc-git-extra-menu-map
(let ((map (make-sparse-keymap))) (let ((map (make-sparse-keymap)))