Is there a way in emacs, spacemacs to be precise, to diff two branches and get 
a list of changed files (I use magit diff revision for this now) BUT ALSO allow 
me to diff the file at point in the list in a ediff session below?

So my ideal workflow would be:

magit-diff the branches

 ----------------------
| foo.rb                    |
| bar.txt                   |
| .....                        |
 ----------------------
When I now go onto foo.rb and trigger the function I am looking for, it will 
spawn a ediff below:

 ----------------------
| foo.rb                    |
| bar.txt                   |
| .....                        |
 ----------------------
| foo.1     | foo.2       |
|              |                |
| + Hello  |                |
| World    | World     |
 ----------------------

Doing the same again on the diff list will change the ediff file, i.a. when I 
go back to the list and call the function on bar.txt it will replace the ediff 
with the ediff for the bar.txt

Is there any way to do this with vc / magit or another plugin? I have no idea 
yet how to script emacs :/


(also asked on stackoverflow here: 
http://stackoverflow.com/questions/33601547/how-to-diff-two-branches-in-emacs-with-ediff-preview
 )

-- 
You received this message because you are subscribed to the Google Groups 
"magit" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to [email protected].
For more options, visit https://groups.google.com/d/optout.

Reply via email to