bug-gnu-emacs
[Top][All Lists]
Advanced

[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: Dmitry Gutov
Subject: bug#60126: 30.0.50; vc-git-checkin: Offer to unstage conflicting changes
Date: Sat, 24 Dec 2022 00:55:25 +0200
User-agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.4.2

On 23/12/2022 02:12, Sean Whitton wrote:
Unfortunately it's probably not much use, because 'git stash push -- x'
stashes all staged changes, it turns out, not just those in x.

Seems to work fine over here.

And the manual says:

   <pathspec>...
       This option is only valid for push command.

The new stash entry records the modified states only for the files that match the pathspec. The index entries and working tree files are then rolled back to the state in HEAD only for these files, too, leaving files that do not match the pathspec intact.

       For more details, see the pathspec entry in gitglossary(7).

Check out 'man git stash', perhaps your version of Git just doesn't have that feature yet. Though I thought it came with the introduction of 'git stash push', as opposed to 'git stash save'.





reply via email to

[Prev in Thread] Current Thread [Next in Thread]