vim-mergetool
agitator.nvim
| vim-mergetool | agitator.nvim | |
|---|---|---|
| 6 | 2 | |
| 281 | 58 | |
| - | - | |
| 0.0 | 5.5 | |
| over 3 years ago | about 2 months 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
agitator.nvim
-
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.
- new neovim plugin with a few git-related functions (blame, open from branch, time-machine)
What are some alternatives?
git-conflict.nvim - A plugin to visualise and resolve merge conflicts in neovim
spaceless.nvim - Automatically strip trailing whitespace as you are editing.
diffview.nvim - Single tabpage interface for easily cycling through diffs for all modified files for any git rev.
committia.vim - A Vim plugin for more pleasant editing on commit messages
lazygit - simple terminal UI for git commands
vim-merginal - Fugitive extension to manage and merge Git branches
diffconflicts - A better Vimdiff Git mergetool
op.nvim - 🔑 1Password for Neovim! Built using the 1Password CLI, Go, and Lua.
vim-fugitive - fugitive.vim: A Git wrapper so awesome, it should be illegal
vim-gh-line - vim plugin that open the link of current line on github
linediff.vim - A vim plugin to perform diffs on blocks of code
tig-explorer.vim - Vim plugin to use Tig as a git client. Seamless switching between vim and Tig with opening in the same buffer.