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.devel Subject: Re: On the adoption of transient.el Date: Tue, 10 Aug 2021 15:40:38 +0300 Message-ID: <77d47675-a981-e181-9327-47763cf59e19@yandex.ru> References: <877di4on3d.fsf@posteo.net> <87im1oy6mw.fsf@posteo.net> <87y29hihea.fsf@posteo.net> <87sfzonu6k.fsf@ucl.ac.uk> <878s1gqlop.fsf@gmail.com> <8735ronpo0.fsf@ucl.ac.uk> <83lf5gjgtp.fsf@gnu.org> <87eeb8gdbq.fsf@telefonica.net> <877dgzebux.fsf@mail.linkov.net> <87eeb2aq2z.fsf@mail.linkov.net> 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="20047"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.11.0 Cc: =?UTF-8?Q?=c3=93scar_Fuentes?= , emacs-devel@gnu.org To: Juri Linkov Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Tue Aug 10 14:42:00 2021 Return-path: Envelope-to: ged-emacs-devel@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 1mDR4x-0004tX-DS for ged-emacs-devel@m.gmane-mx.org; Tue, 10 Aug 2021 14:41:59 +0200 Original-Received: from localhost ([::1]:38826 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mDR4r-0000Le-56 for ged-emacs-devel@m.gmane-mx.org; Tue, 10 Aug 2021 08:41:53 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:58624) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mDR3k-000858-K8 for emacs-devel@gnu.org; Tue, 10 Aug 2021 08:40:44 -0400 Original-Received: from mail-wm1-x336.google.com ([2a00:1450:4864:20::336]:35620) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mDR3i-0003ms-Nz for emacs-devel@gnu.org; Tue, 10 Aug 2021 08:40:44 -0400 Original-Received: by mail-wm1-x336.google.com with SMTP id q11-20020a7bce8b0000b02902e6880d0accso1883347wmj.0 for ; Tue, 10 Aug 2021 05:40:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:subject:to:cc:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=Lj4skO6770yrCLGDDw3q2b3pCvAjD0YT74aNv9CIc9c=; b=a1Ui+foxcFwcnPXZTj1C1WWtK/Zp1YgMsqRIeBvNyS4XBeUFy0ylQ3mgsTfPfX4DqR XPuMBG3BTRUxTt836+B82wJn/iU9qmHcll9cY/Jr4Q+SXnql5cYHPBFZkGFY7TG3SXeP YTCCtzAuR7wiKeyZwq5Ib0FgIFYzcwOnEFqDM+FlTTHR9aoKPFhj1Hc3aOJGuyJTSILM MkWgUWjoeua4OuobyJUL1r45Xbpnq/VPsroxuP5I+d1dPkiqxQ8aAczF5idktBO5Qb5w ZNHLZgVu/YwngOwPumiswIPLn/PPVYyQE4EeRG6sj8zjBURTXsHHWDr6dwI0Wx8P6g6F VVPw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:subject:to:cc:references:from:message-id :date:user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=Lj4skO6770yrCLGDDw3q2b3pCvAjD0YT74aNv9CIc9c=; b=CPGQ5qLSmwkDHX7dCXJhFAZQg100yiiZy9F6TMFi4xiKol//txxeDtswe63FgX1myt CJxhfigt4wBM2Un5Q3EKqte2EZ0hxtuQdERuHV6ZXU/TfkBKwlpFfIGlPpZOVlIVK5NB 61PoxWGU8i2jzMHh1807h16pdMD5ENPVlse2ZKkbC0g7HnDvpH/zSixJ9oCh7e29BMSv S9Lw9SvGxckfIW3jgT0iXMoYeb/9IqlfEjN6cvTqOdec4Oufq0xwvUCF3MaqpbY43IF0 9kdmnW5yGNsf2Ny6ZPR8zZXKPFtuJLSd/vTL/l+BOnOYbGtMJOH4ggXMOagRf8oMzwXX vaIQ== X-Gm-Message-State: AOAM531+DETauXIvGhYzk97A3LPmYmVw8UZQi9hQukiPnjKltyEKWnvj Q5WUBfogcem/a3ajznfsikdYArOF3is= X-Google-Smtp-Source: ABdhPJwmX6s95iEV/P5aAU0CoaPXKJejFAGV/NZcbz6eseM4UOXO8P19m7C8S6vrAD5mchj+l93Ffg== X-Received: by 2002:a7b:cd14:: with SMTP id f20mr4368638wmj.113.1628599240741; Tue, 10 Aug 2021 05:40:40 -0700 (PDT) Original-Received: from [192.168.0.6] ([46.251.119.176]) by smtp.googlemail.com with ESMTPSA id w18sm25025130wrg.68.2021.08.10.05.40.39 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 10 Aug 2021 05:40:39 -0700 (PDT) In-Reply-To: <87eeb2aq2z.fsf@mail.linkov.net> Content-Language: en-US Received-SPF: pass client-ip=2a00:1450:4864:20::336; envelope-from=raaahh@gmail.com; helo=mail-wm1-x336.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, NICE_REPLY_A=-0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Original-Sender: "Emacs-devel" Xref: news.gmane.io gmane.emacs.devel:272271 Archived-At: On 10.08.2021 10:15, Juri Linkov wrote: >> - Let the user edit a diff in the diff-mode buffer >> - Save it to a file >> - 'git apply --cached', to put the contents to the staging area >> - 'git commit' > But these commands don't perform a merge when committing a patch > with changes in the same file. So afterwards `git diff` will show > the reversed diff for already committed changes. Sorry, I don't understand. Could you explain the scenario in more detail?