[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: |
Thu, 22 Dec 2022 20:59:53 -0700 |
User-agent: |
Gnus/5.13 (Gnus v5.13) |
Hello,
On Thu 22 Dec 2022 at 05:12PM -07, Sean Whitton wrote:
>> For completeness, though, here's a way to implement 'git push --staged' with
>> Git plumbing manually: https://stackoverflow.com/a/72582276/615245
>>
>> And as for a 'git pop --index' substitute, if the stash contains only the
>> index area stuff, it might be as easy as
>>
>> git diff stash@{0}^..stash@{0} > patch.diff
>> git apply --cached patch.diff
>> git stash drop
>
> These references are helpful. I'll investigate further.
Here is my patch.
It works, except that sometimes the let-binding of process-environment
fails, such that the commands affect the normal index rather than the
temporary index. Can you see what I'm doing wrong there?
Thanks.
--
Sean Whitton
0001-vc-git-checkin-Stash-other-staged-changes.patch
Description: Text Data
- bug#60126: 30.0.50; vc-git-checkin: Offer to unstage conflicting changes, (continued)
- 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
- 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, Eli Zaretskii, 2022/12/23
- bug#60126: 30.0.50; vc-git-checkin: Offer to unstage conflicting changes, Sean Whitton, 2022/12/23
- bug#60126: 30.0.50; vc-git-checkin: Offer to unstage conflicting changes, Dmitry Gutov, 2022/12/23
- bug#60126: 30.0.50; vc-git-checkin: Offer to unstage conflicting changes, Sean Whitton, 2022/12/23
- bug#60126: 30.0.50; vc-git-checkin: Offer to unstage conflicting changes, Dmitry Gutov, 2022/12/24
- bug#60126: 30.0.50; vc-git-checkin: Offer to unstage conflicting changes, Sean Whitton, 2022/12/24
- bug#60126: 30.0.50; vc-git-checkin: Offer to unstage conflicting changes, Dmitry Gutov, 2022/12/24
- bug#60126: 30.0.50; vc-git-checkin: Offer to unstage conflicting changes, Sean Whitton, 2022/12/24
- bug#60126: 30.0.50; vc-git-checkin: Offer to unstage conflicting changes, Dmitry Gutov, 2022/12/23
- bug#60126: 30.0.50; vc-git-checkin: Offer to unstage conflicting changes, Juri Linkov, 2022/12/20