Skip to contentSkip to conversation

Ediff interactive add

DISCUSSION Rémi Vanicat 1 participant 1 message Jun 15, 2016 3 messages not in the archive

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

A message that is not in the archive (sent off-list or not yet received): CAJcAo8sNgdDg_6qRaZmmpLQMXuB22+Mm+q=uDgxoxJErBuNzNg@mail.gmail.com

A message that is not in the archive (sent off-list or not yet received): [email protected]

#3 lore raw

Frederik Beaujean <[email protected]>

Quoted 18 lines · writes:
Quoted 2 lines · Samuel Wales

I have more on this, but if possible it would be best to make ediff do that natively. I don't know if that's possible.

Thanks for your prompt replies. The reason I looked for this feature is that it is available in the package git-emacs. There I can choose Git -
Add to index - Select changes in current file. Then ediff starts, and I can modify the buffer named <index>:FILENAME at will.
After I answer 'y' to 'Quit this Ediff session?', another question comes up 'Add changes to the git index? (y or n)'. With 'y' I see the message Saving file /tmp/git-emacs-tmp6991oXZ...'

So I guess all it takes is saving a temporary file and adding its content to the index. Given my lack of experience in lisp programming, I don't know how hard it actually is to implement in magit, though. But a quick look into the source code of git-emacs revealed this function

[...]

Quoted 1 line

I would be very happy if this became available in magit.

Could you test what has just been pushed in master, it should do it.

Signature · 1 line
Rémi Vanicat