tig-explorer.vim
vim-mergetool
Our great sponsors
tig-explorer.vim | vim-mergetool | |
---|---|---|
5 | 6 | |
201 | 281 | |
- | - | |
0.0 | 0.0 | |
3 months ago | over 3 years ago | |
Vim Script | Vim Script | |
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.
tig-explorer.vim
-
This is how I use vim and git, any other tips?
I use tig-explorer which allows to launch tig from vim (not really impressive) but open file from tig back into the parent vim (the interesting bit).
-
Gitui: Terminal UI for Git
Tig combined with this vim plugin is big part of my workflow: https://github.com/iberianpig/tig-explorer.vim
-
what are the must have git plugs? in your opinion
In addition to the above I love tig for quick commit viewing: https://github.com/iberianpig/tig-explorer.vim
-
outrun-vim, simple dark colorscheme with treesitter support
For a git tree, there is a lot of plugin that can be integrated. I use TIG integration with https://github.com/iberianpig/tig-explorer.vim or switch directly to terminal with git log --graph
- A work-in-progress Magit clone for Neovim
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
What are some alternatives?
neogit - An interactive and powerful Git interface for Neovim, inspired by Magit
git-conflict.nvim - A plugin to visualise and resolve merge conflicts in neovim
vim-tig - Do a tig in your vim
diffview.nvim - Single tabpage interface for easily cycling through diffs for all modified files for any git rev.
gitui - Blazing 💥 fast terminal-ui for git written in rust 🦀
lazygit - simple terminal UI for git commands
tig - Text-mode interface for git
diffconflicts - A better Vimdiff Git mergetool
magit - It's Magit! A Git Porcelain inside Emacs.
vim-fugitive - fugitive.vim: A Git wrapper so awesome, it should be illegal
lazygit.nvim - Plugin for calling lazygit from within neovim.
linediff.vim - A vim plugin to perform diffs on blocks of code