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 09:47:26 -0700 Message-ID: <87v8m6ggyp.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> Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="7122"; 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 Tue Dec 20 19:33:39 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 1p7hQm-0001Wo-Q4 for geb-bug-gnu-emacs@m.gmane-mx.org; Tue, 20 Dec 2022 19:33:38 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p7fmx-0007DD-Cx; Tue, 20 Dec 2022 11:48:23 -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 1p7fmf-0007Bs-MA for bug-gnu-emacs@gnu.org; Tue, 20 Dec 2022 11:48:07 -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 1p7fmd-0007Sr-BK for bug-gnu-emacs@gnu.org; Tue, 20 Dec 2022 11:48:03 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p7fmc-0006kT-7B for bug-gnu-emacs@gnu.org; Tue, 20 Dec 2022 11:48: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 16:48: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.167155487425914 (code B ref 60126); Tue, 20 Dec 2022 16:48:02 +0000 Original-Received: (at 60126) by debbugs.gnu.org; 20 Dec 2022 16:47:54 +0000 Original-Received: from localhost ([127.0.0.1]:45896 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p7fmT-0006js-Mt for submit@debbugs.gnu.org; Tue, 20 Dec 2022 11:47:53 -0500 Original-Received: from out4-smtp.messagingengine.com ([66.111.4.28]:53203) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p7fmL-0006iW-2d for 60126@debbugs.gnu.org; Tue, 20 Dec 2022 11:47:52 -0500 Original-Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 485135C00B4; Tue, 20 Dec 2022 11:47:30 -0500 (EST) Original-Received: from mailfrontend2 ([10.202.2.163]) by compute5.internal (MEProxy); Tue, 20 Dec 2022 11:47:30 -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=1671554850; x=1671641250; bh=Ro GmqhLoqqqr6aBnZysBn3cBh8IhFeXwhYroMbitk0U=; b=XU62s3eyxHn3CQ0zmL v3BqHn4FvAH8f6qCBKU/MTrl2oG2Kh7PWZE9jkl1rY0gk/W4YltXVk/zB5SWoy6M pzZZ/jwcEIa+5XvVtlGsdNM7jnkPk4y61LtNc/5J4aPN6OvUR3RpE0fs7UFK4ka1 2DNDUsAJ8p4ZqQmfC3Erz90cbPtvsSCVuLmMHGvkF65+qtOp6/wCm0n4U4pB9eyq mXyXVOkp/Xi9SWCzFvPtIDE6+Dbye4cX5nzKQgDXcKuzgSF8AVkDkrAC/NS3xbG9 n9e+TsRYjsggFKWH2dnZQG6ltPMWnEvkyvvvxgtwE/KUA+nMY/iEVJXguipzpu/F bZyw== 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=1671554850; x=1671641250; bh=RoGmqhLoqqqr6aBnZysBn3cBh8Ih FeXwhYroMbitk0U=; b=MdWnze0zlb7aFITPeiNmkdTEY+pqPuxGHmLIIGWoMYuS OkUGdUjnX1YDFg8c1/UrjJqkh5/UpDeCPzI8rDS9kpb3++0jizdCLJhPGcqaL6/y +dqelwuU4h+n1bmxBv9/ZJ8Ic5SJZllSwSTgxbSkbL4OUkVI0otu/3SQrpPYsUD3 XbW9YOLQsvCHfbfmKiFVmQ8kRd64V00x2QN1otES9LAwpN3oHDpBepIl72//5KfK Z1CEM9bv+qmcbkq9VJ7ewrwVWAqCM32KRxSPSsMt01TCjCFooUZ6QsVGkQYSMuDM xkBJtk5NjZDXQeERw/eO+z5zQOIdluAGK3bMOtxVfg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvhedrgeeigdeiiecutefuodetggdotefrodftvf 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 11:47:28 -0500 (EST) Original-Received: by melete.silentflame.com (Postfix, from userid 1000) id A441A7EFD5C; Tue, 20 Dec 2022 09:47:26 -0700 (MST) In-Reply-To: (Dmitry Gutov's message of "Tue, 20 Dec 2022 15:47:04 +0200") 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:251534 Archived-At: Hello, On Tue 20 Dec 2022 at 03:47PM +02, Dmitry Gutov wrote: > On 20/12/2022 08:43, Sean Whitton wrote: >> In addition, you can't stash just the content of the staging area, and >> not also the working tree, without hacks > > I think > > git stash push --staged -- file1 file2 ... > > does that. Ah nice, though, my git doesn't have that option (Debian stable). -- Sean Whitton