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: Tue, 20 Dec 2022 15:47:04 +0200 Message-ID: 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; 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="6447"; 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 Tue Dec 20 14:48:27 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 1p7cyp-0001Ve-4V for geb-bug-gnu-emacs@m.gmane-mx.org; Tue, 20 Dec 2022 14:48:27 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p7cyU-0003C2-Lz; Tue, 20 Dec 2022 08:48:07 -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 1p7cyQ-0003Bl-Ve for bug-gnu-emacs@gnu.org; Tue, 20 Dec 2022 08:48: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 1p7cyQ-0000DN-B8 for bug-gnu-emacs@gnu.org; Tue, 20 Dec 2022 08:48:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p7cyP-0002T7-OH for bug-gnu-emacs@gnu.org; Tue, 20 Dec 2022 08:48:01 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Dmitry Gutov Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Tue, 20 Dec 2022 13:48:01 +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.16715440379324 (code B ref 60126); Tue, 20 Dec 2022 13:48:01 +0000 Original-Received: (at 60126) by debbugs.gnu.org; 20 Dec 2022 13:47:17 +0000 Original-Received: from localhost ([127.0.0.1]:44977 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p7cxg-0002QK-Lf for submit@debbugs.gnu.org; Tue, 20 Dec 2022 08:47:16 -0500 Original-Received: from mail-ej1-f54.google.com ([209.85.218.54]:44614) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p7cxd-0002QE-MM for 60126@debbugs.gnu.org; Tue, 20 Dec 2022 08:47:14 -0500 Original-Received: by mail-ej1-f54.google.com with SMTP id x22so29264262ejs.11 for <60126@debbugs.gnu.org>; Tue, 20 Dec 2022 05:47:13 -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=ax1QWtYQ218fJOwNsdt2BYpJPAzBTkxtS5ajeKXIWn4=; b=Fuwo4hljDAnZdUwtiW9X6ztsZOgRKgry5pAyoSLpHBMtiDKB0njh8aAB3JjVJtT5Qu JROtHSEHJ15Ndjj13wKLTZAdKP6rNXBSU1VqTtyQ3WBljKxC3Afw/O9HS1R33KFxIZ7k O4ucMpscsbjG3lLWOiaw2CpBFbHETouUps+8arHkQS5JhFP52F3GHBbd/IwD9KbzBP5U AP0FyBA8P7ENtnIbGUfeVcVG3oA817EJu8FLWORjXQl2IbzJvVEAQnZY1bOV+pRpNdKu h1KT2IEdAWPKcMHF9Xi6MSHnSzFjHuLGTdsEpAgm/SEQ32h9xN82Dl9eY1+U5k23SDq8 QOZA== 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=ax1QWtYQ218fJOwNsdt2BYpJPAzBTkxtS5ajeKXIWn4=; b=Eh3MYBIbBWKuRDYmdNcooX24vB6fHc9KMrtveRIeLCpHBdoH7R7k/50TQVcY/BW9G+ URO8Udg7nOg8pgfMMbwDAwWllhdKRbwYnfZswDH+G/mXC0cLtels9htlz5703NZFzzaa PyRLLf3xuuNU9Ja2OIa1LWsX0LeCONphQCyE1CkwnZj6LK6HdTEY+wVTk86b1e4kjoDi j8C/ivzwRFhNFJe/VQUY8MP3xnlxP1tPT2orOWNULfk1QvCNg/J8RgmgovzhxxsHxaEC LG9HnNFmkItmVBCip59kd8s/N2eJZ/tU8jyxYMBlNLp0kHEb8EycZp02jPJ0sYL1jWdR JF+g== X-Gm-Message-State: AFqh2kpzO3/z7ikqNMR3ldqjWMArlYPIq0aW02tNWw+QJMnu9VRIOAvR ckfJ72mrsP+ucVu5jULCXrc= X-Google-Smtp-Source: AMrXdXtXtfP5inSSUgTYx+gn6W9vNt0Y9Qon7kUFhaoP8rFNuyYgbIss3gb1RHqlzrPzcWHao2VcsA== X-Received: by 2002:a17:907:8a1e:b0:81b:f617:eb99 with SMTP id sc30-20020a1709078a1e00b0081bf617eb99mr10504885ejc.67.1671544027623; Tue, 20 Dec 2022 05:47:07 -0800 (PST) Original-Received: from [192.168.0.2] ([46.251.119.176]) by smtp.googlemail.com with ESMTPSA id d6-20020a170906304600b007c1a6692aeesm5673416ejd.189.2022.12.20.05.47.06 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 20 Dec 2022 05:47:06 -0800 (PST) Content-Language: en-US In-Reply-To: <87zgbih8wv.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:251507 Archived-At: 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.