From: Juri Linkov <juri@linkov.net>
To: Dmitry Gutov <dgutov@yandex.ru>
Cc: "Óscar Fuentes" <ofv@wanadoo.es>, emacs-devel@gnu.org
Subject: Re: On the adoption of transient.el
Date: Wed, 11 Aug 2021 09:58:41 +0300 [thread overview]
Message-ID: <87mtpoh69a.fsf@mail.linkov.net> (raw)
In-Reply-To: <77d47675-a981-e181-9327-47763cf59e19@yandex.ru> (Dmitry Gutov's message of "Tue, 10 Aug 2021 15:40:38 +0300")
>>> - 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?
This is the shortest test case:
1. make changes in one part of a file
2. create a patch with changes in another part of the same file
3. git apply --cached a.patch
4. git commit -m "Apply a.patch"
5. git commit -a -m "Commit original file changes"
The last commit reverts the changes committed from the patch.
next prev parent reply other threads:[~2021-08-11 6:58 UTC|newest]
Thread overview: 69+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-03 21:13 On the adoption of transient.el Gabriel
2021-07-05 14:24 ` Philip Kaludercic
2021-07-05 16:09 ` Gabriel
2021-07-05 17:00 ` Stefan Monnier
2021-07-05 19:16 ` Lars Ingebrigtsen
2021-07-05 16:50 ` Yuri Khan
2021-07-05 17:06 ` Eli Zaretskii
2021-07-05 17:29 ` Yuri Khan
2021-07-05 17:49 ` Stefan Monnier
2021-07-05 18:09 ` Philip Kaludercic
2021-08-01 20:19 ` Rudolf Adamkovič
2021-08-01 21:08 ` T.V Raman
2021-08-01 21:24 ` Arthur Miller
2021-08-03 13:07 ` Jonas Bernoulli
2021-08-03 20:00 ` Arthur Miller
2021-08-14 3:17 ` Arthur Miller
2021-08-14 12:54 ` Óscar Fuentes
2021-08-14 20:45 ` Arthur Miller
2021-08-15 21:57 ` John Yates
2021-08-16 1:05 ` Arthur Miller
2021-08-16 1:35 ` Stefan Monnier
2021-08-16 2:36 ` Arthur Miller
2021-08-01 21:25 ` Arthur Miller
2021-08-04 11:22 ` Philip Kaludercic
2021-08-04 15:56 ` Óscar Fuentes
2021-08-04 18:56 ` T.V Raman
2021-08-04 19:57 ` Jesse Millwood
2021-08-04 21:45 ` T.V Raman
2021-08-05 7:01 ` Arthur Miller
2021-08-05 8:59 ` Eric S Fraga
2021-08-05 9:23 ` Tim Cross
2021-08-05 10:37 ` Eric S Fraga
2021-08-05 11:01 ` Eli Zaretskii
2021-08-05 14:45 ` Óscar Fuentes
2021-08-05 16:17 ` Eli Zaretskii
2021-08-05 23:17 ` Juri Linkov
2021-08-06 6:11 ` Eli Zaretskii
2021-08-06 2:13 ` Phil Sainty
2021-08-05 23:20 ` Juri Linkov
2021-08-06 12:39 ` John Yates
2021-08-06 14:42 ` Stefan Monnier
2021-08-06 17:20 ` Omar Polo
2021-08-10 7:22 ` Juri Linkov
2021-08-10 10:32 ` John Yates
2021-08-08 1:21 ` Dmitry Gutov
2021-08-10 7:15 ` Juri Linkov
2021-08-10 12:40 ` Dmitry Gutov
2021-08-11 6:58 ` Juri Linkov [this message]
2021-08-13 3:06 ` Dmitry Gutov
2021-08-08 1:42 ` Alfred M. Szmidt
2021-08-10 7:18 ` Juri Linkov
2021-08-10 8:16 ` Alfred M. Szmidt
2021-08-11 6:56 ` Juri Linkov
2021-08-05 9:38 ` Arthur Miller
2021-08-05 9:51 ` Jean-Christophe Helary
2021-08-05 14:33 ` T.V Raman
2021-08-05 14:55 ` Eric S Fraga
2021-08-05 15:05 ` Arthur Miller
2021-08-06 23:02 ` Rudolf Adamkovič
2021-08-07 2:03 ` T.V Raman
2021-08-07 3:15 ` Phil Sainty
2021-08-07 10:19 ` Jonas Bernoulli
2021-08-07 15:42 ` T.V Raman
2021-07-05 19:51 ` Jim Porter
-- strict thread matches above, loose matches on Subject: below --
2022-07-31 9:08 Manuel Uberti
2022-07-31 13:25 ` T.V Raman
2022-07-31 20:03 ` Juri Linkov
2022-08-21 16:04 ` Juri Linkov
2022-08-01 3:32 ` Richard Stallman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87mtpoh69a.fsf@mail.linkov.net \
--to=juri@linkov.net \
--cc=dgutov@yandex.ru \
--cc=emacs-devel@gnu.org \
--cc=ofv@wanadoo.es \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.