Giter VIP home page Giter VIP logo

Comments (8)

bmartin avatar bmartin commented on May 15, 2024

Has anybody worked on getting the ediff support from egg back into magit? I personally like the patch style viewing but some of my colleagues are resistant to using Magit if there isn't an easy way to launch a side-by-side diff.

from magit.

vanicat avatar vanicat commented on May 15, 2024

Try
(eval-after-load "vc-hooks"
'(define-key vc-prefix-map "=" 'ediff-revision))
and then C-x v = when editing a file: Is this what you want, or do you want something more complex?
Se also http://stackoverflow.com/questions/3712834/getting-vc-diff-to-use-ediff-in-emacs-23-2

from magit.

bmartin avatar bmartin commented on May 15, 2024

My primary wish:

In any view that shows a unified diff either in the main window or in diff window, pressing "*" pops up the equivalent ediff (some other key would be fine).

from magit.

vanicat avatar vanicat commented on May 15, 2024

Noted. Definitely "something more complex".

from magit.

pjweisberg avatar pjweisberg commented on May 15, 2024

I think I'm about halfway to getting this feature implemented on my local machine. Just dropping a note in case anyone else reads this and is thinking about doing it.

from magit.

alanfalloon avatar alanfalloon commented on May 15, 2024

I know its not exactly what you asked for, since it used diff-mode and not ediff, but I have a diff-git.el package that depends on magit and it lets you use diff-mode to examine and modify the staged and unstaged diffs (including (un)staging hunks).

https://github.com/alanfalloon/diff-git.el or you can get in through ELPA

from magit.

pjweisberg avatar pjweisberg commented on May 15, 2024

Pull request #165 implements this feature: Press e anywhere within a unified diff to see the two versions in Ediff. (Or the 3 versions, in the case of unmerged files in the status buffer.)

Pull from git://github.com/pjweisberg/magit.git issue40 to try it out before it's merged.

from magit.

torgeir avatar torgeir commented on May 15, 2024

I love this feature for jumping through hunks of a file's changes in a diff! Is there a way to keep skipping through the hunks of all files of a complete branch's diff in this mode?

from magit.

Related Issues (20)

Recommend Projects

  • React photo React

    A declarative, efficient, and flexible JavaScript library for building user interfaces.

  • Vue.js photo Vue.js

    🖖 Vue.js is a progressive, incrementally-adoptable JavaScript framework for building UI on the web.

  • Typescript photo Typescript

    TypeScript is a superset of JavaScript that compiles to clean JavaScript output.

  • TensorFlow photo TensorFlow

    An Open Source Machine Learning Framework for Everyone

  • Django photo Django

    The Web framework for perfectionists with deadlines.

  • D3 photo D3

    Bring data to life with SVG, Canvas and HTML. 📊📈🎉

Recommend Topics

  • javascript

    JavaScript (JS) is a lightweight interpreted programming language with first-class functions.

  • web

    Some thing interesting about web. New door for the world.

  • server

    A server is a program made to process requests and deliver data to clients.

  • Machine learning

    Machine learning is a way of modeling and interpreting data that allows a piece of software to respond intelligently.

  • Game

    Some thing interesting about game, make everyone happy.

Recommend Org

  • Facebook photo Facebook

    We are working to build community through open source technology. NB: members must have two-factor auth.

  • Microsoft photo Microsoft

    Open source projects and samples from Microsoft.

  • Google photo Google

    Google ❤️ Open Source for everyone.

  • D3 photo D3

    Data-Driven Documents codes.