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.
-
vim-gitgutter
A Vim plugin which shows git diff markers in the sign column and stages/previews/undoes hunks and partial hunks.
-
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.
-
tig-explorer.vim
Vim plugin to use Tig as a git client. Seamless switching between vim and Tig with opening in the same buffer.
-
diffview.nvim
Single tabpage interface for easily cycling through diffs for all modified files for any git rev.
-
SaaSHub
SaaSHub - Software Alternatives and Reviews. SaaSHub helps you find the best software and product alternatives
gitsigns : I use it for - displaying hunks in the side panel - navigating between hunks - staging separate hunks fugitive : I use it for - Resolving merge conflicts - Showing git blame
gitsigns : I use it for - displaying hunks in the side panel - navigating between hunks - staging separate hunks fugitive : I use it for - Resolving merge conflicts - Showing git blame
Agree with this 100%, and you can get around the weirdness of nested Neovim instances with neovim-remote, too.
No one has suggested neogit yet
airblade/vim-gitgutter - Gives you the git state of the lines in the gutter of the file.
I dumped them all and went with https://github.com/jesseduffield/lazygit . It is unbeatable!
For merge conflicts, https://github.com/rhysd/conflict-marker.vim is so much easier to use than any any other diff tool.
https://github.com/idanarye/vim-merginal for checking out branches and creating new ones.
Have you heard of lazygit.nvim?
https://github.com/ruanyl/vim-gh-line you can easily jump to the line/blame/tree on any git hosts
In addition to the above I love tig for quick commit viewing: https://github.com/iberianpig/tig-explorer.vim
Personally, I use jonas/tig and voldikss/vim-floaterm.
Personally, I use jonas/tig and voldikss/vim-floaterm.
I haven't seen https://github.com/samoshkin/vim-mergetool mentioned. I'm more and more gravitating towards 2-way diff viewing, also using diffview.nvim. also wrote https://github.com/emmanueltouzery/agitator.nvim with a few helpful functions for my use. And then others that have been mentioned, neogit, gitsigns.
I haven't seen https://github.com/samoshkin/vim-mergetool mentioned. I'm more and more gravitating towards 2-way diff viewing, also using diffview.nvim. also wrote https://github.com/emmanueltouzery/agitator.nvim with a few helpful functions for my use. And then others that have been mentioned, neogit, gitsigns.