vim-mergetool
:cake: Efficient way of using Vim as a Git mergetool (by samoshkin)
tig
Text-mode interface for git (by jonas)
vim-mergetool | tig | |
---|---|---|
6 | 60 | |
281 | 12,170 | |
- | - | |
0.0 | 7.3 | |
over 3 years ago | 4 days ago | |
Vim Script | C | |
MIT License | GNU General Public License v3.0 only |
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
tig
Posts with mentions or reviews of tig.
We have used some of these posts to build our list of alternatives
and similar projects. The last one was on 2024-05-06.
-
Ask HN: Interesting TUIs (text user interfaces), maybe forgotten ones?
https://github.com/jonas/tig is one of the first things I install on a new dev machine. It's a really nice UI for staging files or hunks. Since it's just a companion to the git CLI, it feels much more focused than full-blown git GUIs, and doesn't do anything magical.
-
Every Git Command I Use (Cheatsheet)
Related but I use tig, a TUI, a lot to examine the state of my working tree and index and stage/unstage/reset changes piecemeal. It works great.
- Tig: Text-Mode Interface for Git
-
Magit
I'd like to plug [tig](https://github.com/jonas/tig) for those who don't use emacs. I see lazygit recommended here too, but I've been using tig for years now and love it's simplicity.
-
Is there any solution like Github Desktop and Gitkraken For terminal Users
Try tig
-
What is your preferred version control software and what additional features do you wish it had?
I'm normally a CLI git (and tig) user.
-
TexStudio - git integration for easy committing?
Sometimes when I work in command line I use tig (https://jonas.github.io/tig/). There is also similar tool lazygit (https://github.com/jesseduffield/lazygit)
-
gti, gtti, giit, gut, gti, got, hit, jit, git <enter> {f%ck} <up-arrow-key>
And you accidently open a git TUI
-
This is how I use vim and git, any other tips?
tig +My custom command to fix MR comments by quickly editing an old commit's changes at the time when that commit was created. (Like a more controlled git-absorb that explicitly selects a commit to fixup and therefor avoids rebase-conflicts when squashing)
-
tig to switch branches
today I looked at tig which is a nice text based GUI, and I think I will never use git log again :-)
What are some alternatives?
When comparing vim-mergetool and tig you can also consider the following projects:
git-conflict.nvim - A plugin to visualise and resolve merge conflicts in neovim
lazygit - simple terminal UI for git commands
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.nvim - Plugin for calling lazygit from within neovim.
diffconflicts - A better Vimdiff Git mergetool
vim-floaterm - :computer: Terminal manager for (neo)vim
vim-fugitive - fugitive.vim: A Git wrapper so awesome, it should be illegal
gitsigns.nvim - Git integration for buffers
linediff.vim - A vim plugin to perform diffs on blocks of code
cz-cli - The commitizen command line utility. #BlackLivesMatter