emacs-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: On the adoption of transient.el


From: Juri Linkov
Subject: Re: On the adoption of transient.el
Date: Tue, 10 Aug 2021 10:15:04 +0300
User-agent: Gnus/5.13 (Gnus v5.13) Emacs/28.0.50 (x86_64-pc-linux-gnu)

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



reply via email to

[Prev in Thread] Current Thread [Next in Thread]