Subject: bug#60126: 30.0.50; vc-git-checkin: Offer to unstage conflicting changes

From: Dmitry Gutov <[email-masked]>
Date: Sun, 18 Dec 2022 03:08:02 +0200

On 16/12/2022 20:32, Sean Whitton wrote:
> I seem often to end up with a nonempty index when trying to commit patches
> using C-x v v from diff-mode, so I came up with this patch.

Thanks!

Perhaps we should offer to stash the changes, though?

Starting with Git 2.13, 'git stash' now has the 'push' subcommand which 
accepts individual file names:

   https://stackoverflow.com/a/5506483/615245

Or make it a three-way choice with read-multiple-choice.