Our great sponsors
-
WorkOS
The modern identity platform for B2B SaaS. The APIs are flexible and easy-to-use, supporting authentication, user identity, and complex enterprise features like SSO and SCIM provisioning.
-
diffview.nvim
Single tabpage interface for easily cycling through diffs for all modified files for any git rev.
-
InfluxDB
Power Real-Time Data Analytics at Scale. Get real-time insights from all types of time series data with InfluxDB. Ingest, query, and analyze billions of data points in real-time with unbounded cardinality.
and for just in terminal also check out https://github.com/dandavison/delta for nicer looking diffs, didn't really like the defaults, but with some config I really like it.
you can use gitsigns
In neovim I have a combination of gitsigns and diffview going. I really like the experience of resolving conflicts with diffview, and I just go through the quickfix list populated by gitsigns to handle staging.
Lazygit should fullfill all your GIT needs. https://github.com/jesseduffield/lazygit
There is even a plugin for Vim, that lets you open it in a floating overlay. https://github.com/kdheepak/lazygit.nvim