]> git.eshelyaron.com Git - emacs.git/commit
projects / emacs.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 9fafeb2) | patch
vc-git-checkin: Offer to unstage conflicting changes
authorSean Whitton <spwhitton@spwhitton.name>
Fri, 16 Dec 2022 18:28:20 +0000 (11:28 -0700)
committerSean Whitton <spwhitton@spwhitton.name>
Tue, 20 Dec 2022 23:09:12 +0000 (16:09 -0700)
commit962bdfcdfe7e27687021c7dbaf0bb292afe9483c
tree7a3e3ddc3954db6f8cbe155accf77ad44a091f33tree | snapshot
parent9fafeb2a66fe1cba8f3ad7662196e36ca0b1eca7commit | diff
vc-git-checkin: Offer to unstage conflicting changes

* lisp/vc/vc-git.el (vc-git-checkin): When committing a patch, if
conflicting changes are already staged, offer to clear them, instead
of just immediately failing with "Index not empty" (bug#60126).
lisp/vc/vc-git.el diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.