[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.
- Re: On the adoption of transient.el, (continued)
- Re: On the adoption of transient.el, Juri Linkov, 2021/08/05
- Re: On the adoption of transient.el, Eli Zaretskii, 2021/08/06
- Re: On the adoption of transient.el, Phil Sainty, 2021/08/05
- Re: On the adoption of transient.el, Juri Linkov, 2021/08/05
- Re: On the adoption of transient.el, John Yates, 2021/08/06
- Re: On the adoption of transient.el, Stefan Monnier, 2021/08/06
- Re: On the adoption of transient.el, Omar Polo, 2021/08/06
- Re: On the adoption of transient.el, Juri Linkov, 2021/08/10
- Re: On the adoption of transient.el, John Yates, 2021/08/10
- Re: On the adoption of transient.el, Dmitry Gutov, 2021/08/07
- Re: On the adoption of transient.el,
Juri Linkov <=
- Re: On the adoption of transient.el, Dmitry Gutov, 2021/08/10
- Re: On the adoption of transient.el, Juri Linkov, 2021/08/11
- Re: On the adoption of transient.el, Dmitry Gutov, 2021/08/12
- Re: On the adoption of transient.el, Alfred M. Szmidt, 2021/08/07
- Re: On the adoption of transient.el, Juri Linkov, 2021/08/10
- Re: On the adoption of transient.el, Alfred M. Szmidt, 2021/08/10
- Re: On the adoption of transient.el, Juri Linkov, 2021/08/11
- Re: On the adoption of transient.el, Arthur Miller, 2021/08/05
- Re: On the adoption of transient.el, Jean-Christophe Helary, 2021/08/05
- Re: On the adoption of transient.el, T.V Raman, 2021/08/05