neogit
difftastic
neogit | difftastic | |
---|---|---|
55 | 74 | |
4,264 | 21,574 | |
4.1% | 1.8% | |
9.9 | 9.7 | |
12 days ago | 8 days ago | |
Lua | Rust | |
MIT License | 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.
neogit
-
Neovim for beginners
Neogit
-
Neovim: creating keymaps in lua
I would use this feature of lazy.nvim in a plugin that I rarely need. Something neogit for example. I can spend hours coding without using it. In that particular case I think is nice to have the option to load it when I actually call it.
-
GitUI
This looks very much like the Noevim plugin I began using about a month ago: neogit[0].
The keybindings were a bit rough, and it took me about an hour of use before I was really comfortable with the overall workflow. Once I was, though, Iβve found it to be much faster than my previous workflow (suspending neovim and using git directly in the shell).
0: https://github.com/NeogitOrg/neogit
-
Is there a discard all option in neogit?
Edit: FYI: I made a feature request and got the answer, that it it possible to visually select the files and discard them like this together.
- Massive Update to Neogit and New Home!
-
What IDEA or Vscode feature/function you want to have in neovim eco-system?
This is what I use for general git interaction and itβs pretty neat: neogit. Also integrates diffview
-
Magit
For neovim users, there's a work-in-progress clone, neogit: https://github.com/timUntersberger/neogit/
Some of my colleagues use emacs/magit, and after seeing how absolutely lovely the workflow is, I've put in a lot of work over the last few months expanding it. You can check out my fork here: https://github.com/ckolkey/neogit/
One thing I particularly like to tease my emacs' colleagues about is that my magit is faster than theirs thanks to neovim's async capabilities.
- Your favourite Neovim plugins?
-
What do you use for git integration in neovim?
You could use neogit (https://github.com/TimUntersberger/neogit) for basic commands however I have found it's easier / more versatile to just use lazygit in either another tmux tmux window or within neovim itself.
-
Switching from Emacs. My experience
The only thing I truly miss from Emacs is [Magit](https://magit.vc/) since I still consider it the best git wrapper available. It is just too good. Unfortunately [Neogit](https://github.com/TimUntersberger/neogit) is not quite there yet although I hope it makes it at some point. I didn't like [Fugitive]https://github.com/tpope/vim-fugitive), but I ended up finding a good enough workaround by using [Lazygit](https://github.com/jesseduffield/lazygit) through [Toggleterm](https://github.com/akinsho/toggleterm.nvim).
difftastic
-
Developer tool 'diff' is 40 years old: can it be improved?
There is this amazing tool called difftastic which one guy implements for years on end. It's ridiculous how dedicated he is to the tool. I've been using it for years with git and it works like a charm. [1] [2]
[1] https://news.ycombinator.com/item?id=27768861
[2] https://github.com/Wilfred/difftastic
-
How to Build a Better IDE
Maybe you're already aware of it, but there is difftastic [0], which is a syntax aware diff tool that can also be used with git. Although I haven't tried, I think most IDEs should also be able to use it.
[0] https://difftastic.wilfred.me.uk/
- Some thoughts on a possible AST-aware org-mode three way merge driver
-
How far should a programming language aware diff go?
After switching to difftastic for semantic diff, I have never looked back. (https://github.com/Wilfred/difftastic)
How does semanticdiff compare to that? Anyone got experience?
-
Wednesday Links - Edition 2024-07-17
Difftastic: A Structural Diff Tool for Meaningful Code Reviews (3 min) π§ https://difftastic.wilfred.me.uk/
-
Linus Torvalds adds arbitrary tabs to kernel code
i want a diff tool that shows me exactly which tokens have changed, and which haven't, regardless of how they are laid out.
These already exist: https://github.com/Wilfred/difftastic
when we get that, then we should get even less merge conflicts.
Counterintuitively, that is not the case. AST-merge is a much, much, much, much, much harder problem than AST-diff.
https://github.com/Wilfred/difftastic?tab=readme-ov-file#can...
The fact that diffs can be used to drive a 3-way merge is in fact an accidental property that arises due to the sheer crudeness of the diff format. As soon as you start using more-sophisticated diff formats, solutions to "the diff problem" no longer lead directly to solutions to "the merge problem".
- FLaNK AI Weekly 25 March 2025
-
Difftastic, a structural diff tool that understands syntax
Yes there is an `β-override` option you can use to specify the language in which a file should be parsed.
https://github.com/Wilfred/difftastic/blob/master/CHANGELOG....
-
So You Think You Know Git β Git Tips and Tricks by Scott Chacon
Use the fantastic difftastic instead of git's diff. https://difftastic.wilfred.me.uk/
[alias]
- Difftastic: A structural diff tool that understands syntax
What are some alternatives?
lazygit.nvim - Plugin for calling lazygit from within neovim.
delta - A syntax-highlighting pager for git, diff, grep, and blame output
vim-fugitive - fugitive.vim: A Git wrapper so awesome, it should be illegal
diffsitter - A tree-sitter based AST difftool to get meaningful semantic diffs
lazygit - simple terminal UI for git commands
gumtree - An awesome code differencing tool
diffview.nvim - Single tabpage interface for easily cycling through diffs for all modified files for any git rev.
git-split-diffs - Syntax highlighted side-by-side diffs in your terminal
octo.nvim - Edit and review GitHub issues and pull requests from the comfort of your favorite editor
tree-sitter-cpp - C++ grammar for tree-sitter
gitsigns.nvim - Git integration for buffers
locust - "git diff" over abstract syntax trees