[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
bug#60126: 30.0.50; vc-git-checkin: Offer to unstage conflicting changes
From: |
Sean Whitton |
Subject: |
bug#60126: 30.0.50; vc-git-checkin: Offer to unstage conflicting changes |
Date: |
Mon, 19 Dec 2022 15:30:17 -0700 |
User-agent: |
Gnus/5.13 (Gnus v5.13) |
Hello,
On Sun 18 Dec 2022 at 03:08AM +02, Dmitry Gutov wrote:
> 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.
This is a nice suggestion. A step further would be to unconditionally
stash and unstash. Given how committing patches with C-x v v works, I
don't believe it can ever be the case that the stash is not applicable
afterwards? If that's wrong, I'll implement what you suggest.
--
Sean Whitton
- bug#60126: 30.0.50; vc-git-checkin: Offer to unstage conflicting changes, Sean Whitton, 2022/12/16
- bug#60126: 30.0.50; vc-git-checkin: Offer to unstage conflicting changes, Juri Linkov, 2022/12/17
- bug#60126: 30.0.50; vc-git-checkin: Offer to unstage conflicting changes, Dmitry Gutov, 2022/12/17
- bug#60126: 30.0.50; vc-git-checkin: Offer to unstage conflicting changes,
Sean Whitton <=
- bug#60126: 30.0.50; vc-git-checkin: Offer to unstage conflicting changes, Dmitry Gutov, 2022/12/20
- bug#60126: 30.0.50; vc-git-checkin: Offer to unstage conflicting changes, Sean Whitton, 2022/12/20
- bug#60126: 30.0.50; vc-git-checkin: Offer to unstage conflicting changes, Sean Whitton, 2022/12/20
- bug#60126: 30.0.50; vc-git-checkin: Offer to unstage conflicting changes, Sean Whitton, 2022/12/20
- bug#60126: 30.0.50; vc-git-checkin: Offer to unstage conflicting changes, Dmitry Gutov, 2022/12/20
- bug#60126: 30.0.50; vc-git-checkin: Offer to unstage conflicting changes, Sean Whitton, 2022/12/22