Re: On the adoption of transient.el

[Juri Linkov]

>>> - 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.