emacs-vdiff
delta
| emacs-vdiff | delta | |
|---|---|---|
| 4 | 88 | |
| 208 | 20,765 | |
| - | - | |
| 2.9 | 8.1 | |
| 11 months ago | 7 days ago | |
| Emacs Lisp | Rust | |
| GNU General Public License v3.0 only | MIT License |
Stars - the number of stars that a project has on GitHub. Growth - month over month growth in stars.
Activity is a relative number indicating how actively a project is being developed. Recent commits have higher weight than older ones.
For example, an activity of 9.0 indicates that a project is amongst the top 10% of the most actively developed projects that we are tracking.
emacs-vdiff
-
What are the small reasons to try Emacs?
Not a com user but I’ve been happy with vdiff for diff/merge operations.
- Meld for Macs
-
How to override magit's diff view? (for syntax highlighted, side-by-side diff view)
You can use ediff in magit by pressing E. Other choice would be https://github.com/justbur/emacs-vdiff. Repo explains how to integrate it to magit.
-
On Ediff
I heard vdiff is pretty good too https://github.com/justbur/emacs-vdiff
delta
- Difftastic, a structural diff tool that understands syntax
- Popular Git Config Options
-
So You Think You Know Git – Git Tips and Tricks by Scott Chacon
Thanks for the difftastic & zoxide tips.
However, I've been using this git pager/difftool: https://github.com/dandavison/delta
While it's not structural like difft, it does produce more readable output for me (at least when scrolling fast through git log -p /scanning quickly
-
Essential Command Line Tools for Developers
View on GitHub
- Potencializando Sua Experiência no Linux: Conheça as Ferramentas em Rust para um Desenvolvimento Eficiente
-
Unified versus Split Diff
I'm currently waiting on the integration between Delta and Difftastic:
https://github.com/dandavison/delta/issues/535
Difftastic now has JSON output, whic should make it much easier to build this.
- Delta, a syntax-highlighting pager for Git, diff, and grep output
- Ask HN: What's a new developer tool you recently started using?
-
Magit
I'm surely in the minority here. I've been using Emacs for almost a decade now, but I just can't get into the Magit workflow. I've tried several times, but always end up going back to Git on the command line. I have dozens of aliases, shell integrations, a nice diff viewer[1], etc., and interacting with Git has become muscle memory. I can commit, cherry-pick, rebase, bisect, fix conflicts, etc., in a fraction of the time it would take me to navigate Magit's UI. I'm sure with enough practice, a Magit user could do this more quickly and efficiently, but honestly, with some custom-built porcelain, Git's UI is not so bad. Though this could very well be Stockholm syndrome after using it for such a long time...
For whatever reason, Magit's opinionated workflows never clicked with me. A part of it is the concern that it will do something weird to my repo that I'll then have to waste more time undoing manually. I usually don't trust sugary wrappers around tools. And another is the fact I don't use Emacs on all machines, and setting up Git on a remote system is just a matter of copying over my config and some shell integrations.
Also, on a more personal note, I find the cultish fanboyism whenever Magit is brought up slightly offputting. Does anyone have anything bad to say about it? No software can realistically be this infallible. :)
[1]: https://github.com/dandavison/delta
-
How to use Git?
For looking at diffs I still prefer the command line though, and use delta to view diffs between commits or branches.
What are some alternatives?
magit-delta - Use delta (https://github.com/dandavison/delta) when viewing diffs in Magit
diff-so-fancy - Good-lookin' diffs. Actually… nah… The best-lookin' diffs. :tada:
smart-mode-line - A powerful and beautiful mode-line for Emacs.
difftastic - a structural diff that understands syntax 🟥🟩
god-mode - Minor mode for God-like command entering
vim-fugitive - fugitive.vim: A Git wrapper so awesome, it should be illegal
emacs-solaire-mode - If only certain buffers could be so grossly incandescent.
lazygit - simple terminal UI for git commands
diffview-mode - View diffs side-by-side in Emacs
vim-gitgutter - A Vim plugin which shows git diff markers in the sign column and stages/previews/undoes hunks and partial hunks.
elpm - A elisp package manager with a cli
gitui - Blazing 💥 fast terminal-ui for git written in rust 🦀