vim-mergetool
:cake: Efficient way of using Vim as a Git mergetool (by samoshkin)
auto-git-diff
A vim plugin which shows git diff for Git Rebase Interactive (by hotwatermorning)
| vim-mergetool | auto-git-diff | |
|---|---|---|
| 6 | 2 | |
| 281 | 108 | |
| - | - | |
| 0.0 | 10.0 | |
| over 3 years ago | over 1 year ago | |
| Vim Script | Vim Script | |
| MIT License | - |
The number of mentions indicates the total number of mentions that we've tracked plus the number of user suggested alternatives.
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.
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
Posts with mentions or reviews of vim-mergetool.
We have used some of these posts to build our list of alternatives
and similar projects. The last one was on 2022-07-15.
-
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
auto-git-diff
Posts with mentions or reviews of auto-git-diff.
We have used some of these posts to build our list of alternatives
and similar projects. The last one was on 2022-03-30.
- what are the must have git plugs? in your opinion
-
Show commit content in interactive rebase
auto-git-diff plugin for this
What are some alternatives?
When comparing vim-mergetool and auto-git-diff you can also consider the following projects:
git-conflict.nvim - A plugin to visualise and resolve merge conflicts in neovim
committia.vim - A Vim plugin for more pleasant editing on commit messages
diffview.nvim - Single tabpage interface for easily cycling through diffs for all modified files for any git rev.
vim-fugitive - fugitive.vim: A Git wrapper so awesome, it should be illegal
lazygit - simple terminal UI for git commands
conflict-marker.vim - Weapon to fight against conflicts in Vim.
diffconflicts - A better Vimdiff Git mergetool
neovim-remote - :ok_hand: Support for --remote and friends.
linediff.vim - A vim plugin to perform diffs on blocks of code
gitsigns.nvim - Git integration for buffers
vim-mergetool vs git-conflict.nvim
auto-git-diff vs committia.vim
vim-mergetool vs diffview.nvim
auto-git-diff vs vim-fugitive
vim-mergetool vs lazygit
auto-git-diff vs conflict-marker.vim
vim-mergetool vs diffconflicts
auto-git-diff vs lazygit
vim-mergetool vs vim-fugitive
auto-git-diff vs neovim-remote
vim-mergetool vs linediff.vim
auto-git-diff vs gitsigns.nvim