vim-mergetool
lazygit
| vim-mergetool | lazygit | |
|---|---|---|
| 6 | 145 | |
| 281 | 45,761 | |
| - | - | |
| 0.0 | 9.8 | |
| over 3 years ago | 5 days ago | |
| Vim Script | Go | |
| 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
-
Why Don't I Like Git More?
I've started to en ntegrate lazygit into my workflow.
It's quite easy to work with and I use git in a more powerfull way. My main problem is finding the way in all hotkeys.
https://github.com/jesseduffield/lazygit?tab=readme-ov-file#...
- Lazygit Release v0.41.0
-
How to be good at Open Source 🧑💻🌏
I recently did this with lazygit, a terminal-based git client I use every day. I wanted to add co-authors to commits, which is handy for pair programming at Incubyte
- Lazygit v0.41
-
Easy Access to Terminal Commands in Neovim using FTerm
The last thing you really need is a common set of tools that you want fingertip access to. I really commonly use LazyGit and K9s in my day job so those are the tools I will show off in this article.
-
Level Up Your Dev Workflow: Conquer Web Development with a Blazing Fast Neovim Setup (Part 1)
lazygit (optional)
-
Yozora: Linux Configurator
gl is a lazygit extended command, fist refreshes the deleted remote branches and then opens lazygit.
-
5 Developer CLI Essentials
3. lazygit
-
Ask HN: Can we do better than Git for version control?
Yes, but due to its simplicity + extensibility + widespread adoption, I wouldn’t be surprised if we’re still using Git 100+ years from now.
The current trend (most popular and IMO likely to succeed) is to make tools (“layers”) which work on top of Git, like more intuitive UI/patterns (https://github.com/jesseduffield/lazygit, https://github.com/arxanas/git-branchless) and smart merge resolvers (https://github.com/Symbolk/IntelliMerge, https://docs.plasticscm.com/semanticmerge/how-to-configure/s...). Git it so flexible, even things that it handles terribly by default, it handles
-
Slow magit and async input
I have the same issue with big repos, but in my case it hangs for minutes. In those instances I use lazygit
What are some alternatives?
git-conflict.nvim - A plugin to visualise and resolve merge conflicts in neovim
gitui - Blazing 💥 fast terminal-ui for git written in rust 🦀
diffview.nvim - Single tabpage interface for easily cycling through diffs for all modified files for any git rev.
tig - Text-mode interface for git
diffconflicts - A better Vimdiff Git mergetool
vim-fugitive - fugitive.vim: A Git wrapper so awesome, it should be illegal
magit - It's Magit! A Git Porcelain inside Emacs.
linediff.vim - A vim plugin to perform diffs on blocks of code
vim-conflicted - Easy git merge conflict resolution in Vim
neogit - An interactive and powerful Git interface for Neovim, inspired by Magit