Comments (8)
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.
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.
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.
Noted. Definitely "something more complex".
from magit.
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.
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.
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.
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)
- Package-Requires header should be single line HOT 8
- Jump to pushremote-related sections in magit status buffer does not seem to work HOT 1
- completing-read-multiple is not supported by ivy and similar HOT 1
- magit-log-select-mode doesn't wash the log HOT 3
- git-commit: C-c C-s for signoff doesn't work anymore HOT 3
- On commit I get a voluminous error: command-execute: Wrong type argument: listp.....
- Fail to edit the commit message when a secondary worktree is inside a symlinked directory HOT 4
- Recent commits showing `^L` between elements. HOT 4
- Incorrect displaying of recent commits HOT 1
- issues with compat.el HOT 1
- intermittent authentication failures HOT 1
- transient-prefix-object requires transient 0.5.0 HOT 2
- Adapt to `derived-mode-p` changes in emacs-master HOT 3
- Error when attempting to run magit-branch HOT 1
- (void-function transient-prefix-object) HOT 3
- Magit displays warning about transient version, even though I'm using the latest. HOT 5
- magit-log-mode-hook Does Not Work
- Magit commit fails with `safe.barerepository=explicit`. HOT 13
- Hunk refinement does not work for unmerged files HOT 1
- magit-blame shows CommitDate instead of AuthorDate
Recommend Projects
-
React
A declarative, efficient, and flexible JavaScript library for building user interfaces.
-
Vue.js
🖖 Vue.js is a progressive, incrementally-adoptable JavaScript framework for building UI on the web.
-
Typescript
TypeScript is a superset of JavaScript that compiles to clean JavaScript output.
-
TensorFlow
An Open Source Machine Learning Framework for Everyone
-
Django
The Web framework for perfectionists with deadlines.
-
Laravel
A PHP framework for web artisans
-
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.
-
Visualization
Some thing interesting about visualization, use data art
-
Game
Some thing interesting about game, make everyone happy.
Recommend Org
-
Facebook
We are working to build community through open source technology. NB: members must have two-factor auth.
-
Microsoft
Open source projects and samples from Microsoft.
-
Google
Google ❤️ Open Source for everyone.
-
Alibaba
Alibaba Open Source for everyone
-
D3
Data-Driven Documents codes.
-
Tencent
China tencent open source team.
from magit.