- lazygit: a TUI for git. This is my day to day UI for staging, committing, interactive rebases. I have delta configured for diffs in lazygit.
- neovim (nvimdiff): for diffing, and conflict resolution.
- vscode/neovim: I whatever functionally my editor had (or some plugins for neovim) for live changes as I work on code.
this post was submitted on 24 Feb 2026
35 points (97.3% liked)
Git
4568 readers
17 users here now
Git is a free and open source distributed version control system designed to handle everything from small to very large projects with speed and efficiency.
Resources
Rules
- Follow programming.dev rules
- Be excellent to each other, no hostility towards users for any reason
- No spam of tools/companies/advertisements. It’s OK to post your own stuff part of the time, but the primary use of the community should not be self-promotion.
Git Logo by Jason Long is licensed under the Creative Commons Attribution 3.0 Unported License.
founded 2 years ago
MODERATORS
you are viewing a single comment's thread
view the rest of the comments
view the rest of the comments