From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Sean Whitton Newsgroups: gmane.emacs.bugs Subject: bug#60126: 30.0.50; vc-git-checkin: Offer to unstage conflicting changes Date: Tue, 20 Dec 2022 16:41:29 -0700 Message-ID: <87wn6lzlqu.fsf@melete.silentflame.com> 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> Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="4436"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Cc: 60126@debbugs.gnu.org, juri@linkov.net To: Dmitry Gutov Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Wed Dec 21 00:42:28 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 1p7mFg-0000yu-8l for geb-bug-gnu-emacs@m.gmane-mx.org; Wed, 21 Dec 2022 00:42:28 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p7mFJ-0005WU-LL; Tue, 20 Dec 2022 18:42:05 -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 1p7mFH-0005W9-82 for bug-gnu-emacs@gnu.org; Tue, 20 Dec 2022 18:42: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 1p7mFG-0005Nn-Ty for bug-gnu-emacs@gnu.org; Tue, 20 Dec 2022 18:42:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p7mFG-0005xz-F4 for bug-gnu-emacs@gnu.org; Tue, 20 Dec 2022 18:42:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Sean Whitton Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Tue, 20 Dec 2022 23:42: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.167157969922925 (code B ref 60126); Tue, 20 Dec 2022 23:42:02 +0000 Original-Received: (at 60126) by debbugs.gnu.org; 20 Dec 2022 23:41:39 +0000 Original-Received: from localhost ([127.0.0.1]:47799 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p7mEt-0005xf-Ey for submit@debbugs.gnu.org; Tue, 20 Dec 2022 18:41:39 -0500 Original-Received: from wout3-smtp.messagingengine.com ([64.147.123.19]:47531) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p7mEr-0005xU-Ch for 60126@debbugs.gnu.org; Tue, 20 Dec 2022 18:41:37 -0500 Original-Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.west.internal (Postfix) with ESMTP id EF6B53200392; Tue, 20 Dec 2022 18:41:30 -0500 (EST) Original-Received: from mailfrontend2 ([10.202.2.163]) by compute5.internal (MEProxy); Tue, 20 Dec 2022 18:41:31 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=spwhitton.name; h=cc:cc:content-type:date:date:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:sender :subject:subject:to:to; s=fm1; t=1671579690; x=1671666090; bh=x2 NZYPjaSq32noLoHv2LsQhY97P06iPPuV8/2SsEvfw=; b=mi/DbsOAlMW1epLWuz MCz/7rq1iXmJ/DRCbUlfXbuwLaCHXu6d1DBtUza1Nj4sMw9iv3g6crOxeq4/CQA+ D3GKb/iIKG2IVEYxANuEvKywfYIj3scSyAxQxCq8NK/7lhzvwU1ynZ8J/jS6yyVi C+c3dzbObjqytCiB18vsCu00X+mjPBcHYtbqt9H8+TZsyikTd0qVEfvBRcKAUpAH gpkuQev5uPbf0/cFM5bEFzLd1PTNsyiGgCcc/OfZ/1DQa+Ng6ta+/oM30qNje2FI qAFkK1PswfDjBlX8fkkfp6psINyr/nsVUAgfGF/rOXXFIJTBBLGolHVIoQM7IKg3 5RWw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-type:date:date:feedback-id :feedback-id:from:from:in-reply-to:in-reply-to:message-id :mime-version:references:reply-to:sender:subject:subject:to:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm2; t=1671579690; x=1671666090; bh=x2NZYPjaSq32noLoHv2LsQhY97P0 6iPPuV8/2SsEvfw=; b=UFnlHSJVsOM5dJCcu615aM+DXRMa4YoUgueH+ZlQUlJh 3fZ2talpAJSOy3un6ZED1/MlftGttBBl1IA9cR4nMGY0ds6Vnzv+QzNwpEO8mhuL YPGNTEuGw2Hko+H1aQmU8jM9W7xlewJbXPdPEkRtA3my5Ogn7UD+alXb95Ldoc/J Cwae+k7jnE/Y98lVNU55S2p/BfPMHSF4GHhQad4GoEi/VJxaBZC92oYfO6KXI0iM SW0odGMbESt1f9L6OR6VMJX+/u5Ze/Gf6i26FCAkIQE13XH/bTS9C3S0a6r0aKr1 XP/i8P4nHRRtFS9KDJiwL8Kb7f6pLb1vTQJ2lTPfaA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvhedrgeejgdduvdcutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpefhvfevufgjfhffkfgfgggtsehttddttddtredtnecuhfhrohhmpefuvggrnhcu hghhihhtthhonhcuoehsphifhhhithhtohhnsehsphifhhhithhtohhnrdhnrghmvgeqne cuggftrfgrthhtvghrnheptdffvdffueeluedvteekvdevhefghedvgeevgffhvedukeeg geelveegjeekteeknecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilh hfrhhomhepshhpfihhihhtthhonhesshhpfihhihhtthhonhdrnhgrmhgv X-ME-Proxy: Feedback-ID: i23c04076:Fastmail Original-Received: by mail.messagingengine.com (Postfix) with ESMTPA; Tue, 20 Dec 2022 18:41:30 -0500 (EST) Original-Received: by melete.silentflame.com (Postfix, from userid 1000) id 546B67EFAEE; Tue, 20 Dec 2022 16:41:29 -0700 (MST) In-Reply-To: <87zgbh1xkn.fsf@melete.silentflame.com> (Sean Whitton's message of "Tue, 20 Dec 2022 16:10:00 -0700") 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:251544 Archived-At: Hello, On Tue 20 Dec 2022 at 04:10PM -07, Sean Whitton wrote: > ... afterwards the unstaged changes > will have been unstaged, mixed in with the staged changes again. afterwards the staged changes will have been unstaged, mixed in with the unstaged changes again* -- Sean Whitton