mirror of
git://git.sv.gnu.org/emacs.git
synced 2025-12-05 22:20:24 -08:00
Fix vc-git-uncommit-revisions-from-end
* lisp/vc/vc-git.el (vc-git-uncommit-revisions-from-end): Don't leave changes staged.
This commit is contained in:
parent
577821f143
commit
917f5e25de
1 changed files with 2 additions and 2 deletions
|
|
@ -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)))
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue