diff options
| author | Sean Whitton <spwhitton@spwhitton.name> | 2022-12-16 11:28:20 -0700 |
|---|---|---|
| committer | Sean Whitton <spwhitton@spwhitton.name> | 2022-12-20 16:09:12 -0700 |
| commit | 962bdfcdfe7e27687021c7dbaf0bb292afe9483c (patch) | |
| tree | 7a3e3ddc3954db6f8cbe155accf77ad44a091f33 /lisp/emacs-lisp | |
| parent | 9fafeb2a66fe1cba8f3ad7662196e36ca0b1eca7 (diff) | |
| download | emacs-962bdfcdfe7e27687021c7dbaf0bb292afe9483c.tar.gz emacs-962bdfcdfe7e27687021c7dbaf0bb292afe9483c.tar.bz2 emacs-962bdfcdfe7e27687021c7dbaf0bb292afe9483c.zip | |
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).
Diffstat (limited to 'lisp/emacs-lisp')
0 files changed, 0 insertions, 0 deletions