vim-mergetool
lazygit.nvim
vim-mergetool | lazygit.nvim | |
---|---|---|
6 | 13 | |
281 | 1,183 | |
- | - | |
0.0 | 5.2 | |
over 3 years ago | about 1 month ago | |
Vim Script | Lua | |
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.
vim-mergetool
-
Any plugin to achieve this dual buffer view for diffs?
I'm using diffview.nvim and https://github.com/samoshkin/vim-mergetool for merge conflicts resolving.
-
What git plugin is being used?
For resolving merge conflicts: samoshkin/vim-mergetool
-
what are the must have git plugs? in your opinion
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.
-
Is there a better way to see git diff in vim?
You should also try vim-mergetool .
- Please finally tell me how do you resolve conflicts in (neo)vim?
- Using neovim as a git diff tool
lazygit.nvim
-
How to use Git?
There is even a plugin for Vim, that lets you open it in a floating overlay. https://github.com/kdheepak/lazygit.nvim
-
Switching from Emacs. My experience
there's a lazygit plugin if you want to skip the step of opening Toggleterm
-
Git CLI tools and vim
I really like this lazygit integration: https://github.com/kdheepak/lazygit.nvim
-
Poll: how do you jump to Git conflict markers?
So I use https://github.com/kdheepak/lazygit.nvim All of my git workflow is done in lazygit gg opens the float and away I go
-
Setup git commit dialog close to IntelliJ IDEA style?
I don't use IntelliJ, so, I don't know how it exactly looks like. But I use this: https://github.com/kdheepak/lazygit.nvim
-
Best Git Integration for Neovim?
Why not just use lazygit.nvim?
-
Lazygit - Manage your git repository inside Neovim
But using vim-floaterm instead of the https://github.com/kdheepak/lazygit.nvim plugin (which mentions a different plugin https://github.com/akinsho/nvim-toggleterm.lua#custom-terminals as an alternative).
-
what are the must have git plugs? in your opinion
Have you heard of lazygit.nvim?
- Ask HN: How do you stop forgetting to commit or push?
-
Lazygit: A simple terminal UI for Git commands
There is also Neovim plugin which can open lazygit in a floating window. Files will be opened in the active Neovim instance.
https://github.com/kdheepak/lazygit.nvim
What are some alternatives?
git-conflict.nvim - A plugin to visualise and resolve merge conflicts in neovim
vim-fugitive - fugitive.vim: A Git wrapper so awesome, it should be illegal
diffview.nvim - Single tabpage interface for easily cycling through diffs for all modified files for any git rev.
neogit - An interactive and powerful Git interface for Neovim, inspired by Magit
lazygit - simple terminal UI for git commands
vim-floaterm - :computer: Terminal manager for (neo)vim
diffconflicts - A better Vimdiff Git mergetool
tig - Text-mode interface for git
gitui - Blazing 💥 fast terminal-ui for git written in rust 🦀
linediff.vim - A vim plugin to perform diffs on blocks of code
gitsigns.nvim - Git integration for buffers