diff options
| author | Sean Whitton | 2025-11-29 14:29:58 +0000 |
|---|---|---|
| committer | Sean Whitton | 2025-11-29 14:29:58 +0000 |
| commit | 917f5e25deeddc229a765c8ff3cabfb2e375e82a (patch) | |
| tree | c2f4b4e1d821e1102251e130191b738e154a87d6 | |
| parent | 577821f14352aa676613e6283a47ac5556b47d7c (diff) | |
| download | emacs-917f5e25deeddc229a765c8ff3cabfb2e375e82a.tar.gz emacs-917f5e25deeddc229a765c8ff3cabfb2e375e82a.zip | |
Fix vc-git-uncommit-revisions-from-end
* lisp/vc/vc-git.el (vc-git-uncommit-revisions-from-end): Don't
leave changes staged.
| -rw-r--r-- | lisp/vc/vc-git.el | 4 |
1 files 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." | |||
| 2340 | (vc-git-command nil 0 nil "reset" "--hard" rev)) | 2340 | (vc-git-command nil 0 nil "reset" "--hard" rev)) |
| 2341 | 2341 | ||
| 2342 | (defun vc-git-uncommit-revisions-from-end (rev) | 2342 | (defun vc-git-uncommit-revisions-from-end (rev) |
| 2343 | "Soft reset back to REV. | 2343 | "Mixed reset back to REV. |
| 2344 | It is an error if REV is not on the current branch." | 2344 | It is an error if REV is not on the current branch." |
| 2345 | (vc-git--assert-revision-on-branch rev (vc-git--current-branch)) | 2345 | (vc-git--assert-revision-on-branch rev (vc-git--current-branch)) |
| 2346 | (vc-git-command nil 0 nil "reset" "--soft" rev)) | 2346 | (vc-git-command nil 0 nil "reset" "--mixed" rev)) |
| 2347 | 2347 | ||
| 2348 | (defvar vc-git-extra-menu-map | 2348 | (defvar vc-git-extra-menu-map |
| 2349 | (let ((map (make-sparse-keymap))) | 2349 | (let ((map (make-sparse-keymap))) |