From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Dmitry Gutov Newsgroups: gmane.emacs.bugs Subject: bug#60126: 30.0.50; vc-git-checkin: Offer to unstage conflicting changes Date: Sat, 24 Dec 2022 00:55:25 +0200 Message-ID: <078567f2-ec43-7de4-ed13-1f5d203c3de7@yandex.ru> References: <38d4d719-8f3c-9bb6-b141-f7e9ca66333c@yandex.ru> <871qovjabq.fsf@melete.silentflame.com> <4513ac99-76d1-cdd6-fcc9-59208b5002f3@yandex.ru> <87zgbih8wv.fsf@melete.silentflame.com> <392bbde0-9d6e-83c4-0639-af406e279ef1@yandex.ru> <87h6xqgg65.fsf@melete.silentflame.com> <87zgbh1xkn.fsf@melete.silentflame.com> <4910f545-d7b1-9f6b-8262-fd7fc89d589d@yandex.ru> <87h6xnasgn.fsf@melete.silentflame.com> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="3476"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.4.2 Cc: 60126@debbugs.gnu.org, juri@linkov.net To: Sean Whitton Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Fri Dec 23 23:56:23 2022 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1p8qxi-0000kR-Qi for geb-bug-gnu-emacs@m.gmane-mx.org; Fri, 23 Dec 2022 23:56:22 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p8qxQ-0002oM-LA; Fri, 23 Dec 2022 17:56:04 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p8qxP-0002ny-1n for bug-gnu-emacs@gnu.org; Fri, 23 Dec 2022 17:56:03 -0500 Original-Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1p8qxO-0002w3-Q0 for bug-gnu-emacs@gnu.org; Fri, 23 Dec 2022 17:56:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p8qxO-00031O-Au for bug-gnu-emacs@gnu.org; Fri, 23 Dec 2022 17:56:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Dmitry Gutov Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 23 Dec 2022 22:56:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60126 X-GNU-PR-Package: emacs Original-Received: via spool by 60126-submit@debbugs.gnu.org id=B60126.167183613611608 (code B ref 60126); Fri, 23 Dec 2022 22:56:02 +0000 Original-Received: (at 60126) by debbugs.gnu.org; 23 Dec 2022 22:55:36 +0000 Original-Received: from localhost ([127.0.0.1]:39299 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p8qwy-00031A-5G for submit@debbugs.gnu.org; Fri, 23 Dec 2022 17:55:36 -0500 Original-Received: from mail-ej1-f47.google.com ([209.85.218.47]:33400) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p8qww-000313-Em for 60126@debbugs.gnu.org; Fri, 23 Dec 2022 17:55:34 -0500 Original-Received: by mail-ej1-f47.google.com with SMTP id u9so14886655ejo.0 for <60126@debbugs.gnu.org>; Fri, 23 Dec 2022 14:55:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :sender:from:to:cc:subject:date:message-id:reply-to; bh=AAtIrXFabKDCcKvNY+wybX2El1EF9z3oOfhmQyOYdj8=; b=dDwXitsz0RqEAv2ahTph9kQ8yofHhsjG/wsadRWtKllUhdjgqDUub0GZPmlmjnTtpQ 8RC9NQAzdA2MFkY7cC9Lj65bFnWjhyavi2bfk5HmFJiapdJclj7K716pKzPRqF1ErjZX DFHlxT19DrIE5z5xjMOdgKOtMMmqt0SylTYtPVHbEML+rXSA1YWo5LDN1GvwLqplJnCL weAEgvKP7YqazD7L4rbFAy/all9z+9z28R8CJT0EYOmRWPasavpIW0lNDWwT5VpScIQM jrbQZHdPAUhrJ2kArycNW+6ccf5NOd39RcU7cWYzawd5UZKJr7mBHFWJyPTsucSaameh cYWw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :sender:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=AAtIrXFabKDCcKvNY+wybX2El1EF9z3oOfhmQyOYdj8=; b=JuIPXb2QyVWaWtTsyT7EPfXvBKCrorAwVh7nEqa/eyu/QiqRShSinWj2rvWfN/BU8+ mPVBEBwwi4fdsIEzdW9bAu8UZ2NeQAMFSWeYPh1NEFIGNrGkgy8axX7fZ1Q1fOp3Mceb A3HHeSsXUHOROEcxmlSAF0w22B1Fh+rZuXhaG2P5y+ACoB+E/3nS5cG5nuba6Qps6Cjd mE5tSmcz/N4KrLYP0IB0HmDZU/MowEvVYD8AQrW2ySrgRIS5HT0fzSkB8pHnOy9l4GwN jfJO6f/6DcJU7iPtbfw1cHJuuSeaoaJ7RxrMkifGFEk4FJY4w5hrHKksFT9/zPGiWw9d 4eeg== X-Gm-Message-State: AFqh2kpCjJOZnlV7VvatVXksLyy8iCLl5EDXlH3DrFFrcT+YIzsAgtdD aoDIqB7HSn1Epf/ZVVnuOWg= X-Google-Smtp-Source: AMrXdXuz8BZdpGawk2qjDU/JImsgcApXb2Zi5O7Z2HigQVHGHc+8FNbD7+t//6338A8Oa0028888HQ== X-Received: by 2002:a17:907:a64b:b0:7c1:13b7:a5a1 with SMTP id vu11-20020a170907a64b00b007c113b7a5a1mr10347827ejc.46.1671836128318; Fri, 23 Dec 2022 14:55:28 -0800 (PST) Original-Received: from [192.168.0.2] ([46.251.119.176]) by smtp.googlemail.com with ESMTPSA id kw18-20020a170907771200b0077077c62cadsm1846904ejc.31.2022.12.23.14.55.27 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 23 Dec 2022 14:55:27 -0800 (PST) Content-Language: en-US In-Reply-To: <87h6xnasgn.fsf@melete.silentflame.com> X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.bugs:251751 Archived-At: 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: ... 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'.