Our great sponsors
-
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.
-
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.
This in a floating terminal and gitsigns has worked really well for me.
For resolving conflicts, I like https://github.com/whiteinge/diffconflicts. It's really good at cutting the noise from conflict markers and only showing what matters.
For git blame, there are a few plugins that can display the history of a given line. One that comes to mind is https://github.com/rhysd/git-messenger.vim, but there are others (including some written in Lua).
gitui inside FTerm.nvim has been my preferred method to interact with git from within nvim. gitui has indeed proven to be a great frontend to git.
gitui inside FTerm.nvim has been my preferred method to interact with git from within nvim. gitui has indeed proven to be a great frontend to git.
vim-fugitive with a bunch of keybindings for usual git operations.
vgit.nvim for inline diff.
I did this tool https://github.com/Mte90/gitapper for git that is a git wrapper/alias with script executed before/after a git command to replace some behavior and integrate it with fzf as example.