From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Juri Linkov Newsgroups: gmane.emacs.devel Subject: Re: On the adoption of transient.el Date: Tue, 10 Aug 2021 10:15:04 +0300 Organization: LINKOV.NET Message-ID: <87eeb2aq2z.fsf@mail.linkov.net> 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> Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="15043"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.0.50 (x86_64-pc-linux-gnu) Cc: =?iso-8859-1?Q?=D3scar?= Fuentes , emacs-devel@gnu.org To: Dmitry Gutov Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Tue Aug 10 09:25:23 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 1mDM8Y-0003d1-Pa for ged-emacs-devel@m.gmane-mx.org; Tue, 10 Aug 2021 09:25:22 +0200 Original-Received: from localhost ([::1]:46192 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mDM8X-0003T3-71 for ged-emacs-devel@m.gmane-mx.org; Tue, 10 Aug 2021 03:25:21 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:51490) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mDM7b-00027y-TF for emacs-devel@gnu.org; Tue, 10 Aug 2021 03:24:24 -0400 Original-Received: from relay1-d.mail.gandi.net ([217.70.183.193]:43393) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mDM7Z-0003OE-FX for emacs-devel@gnu.org; Tue, 10 Aug 2021 03:24:23 -0400 Original-Received: (Authenticated sender: juri@linkov.net) by relay1-d.mail.gandi.net (Postfix) with ESMTPSA id 90E5D24000A; Tue, 10 Aug 2021 07:24:18 +0000 (UTC) In-Reply-To: (Dmitry Gutov's message of "Sun, 8 Aug 2021 04:21:22 +0300") Received-SPF: pass client-ip=217.70.183.193; envelope-from=juri@linkov.net; helo=relay1-d.mail.gandi.net X-Spam_score_int: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham 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:272257 Archived-At: >> `git stash pop -q` > > For your consideration, here's a description of the strategy used by the > venerable commit-patch command/package: > > https://github.com/caldwell/commit-patch/blob/master/commit-patch#L212-L214 Thanks for the reference, it's a good example for implementing a similar command in vc. > - 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. This means there are no alternatives to using `git stash pop` that performs the merge.