vim-mergetool
neogit
vim-mergetool | neogit | |
---|---|---|
2 | 54 | |
1 | 3,357 | |
- | 5.7% | |
10.0 | 9.9 | |
almost 3 years ago | 2 days 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
-
What IDEA or Vscode feature/function you want to have in neovim eco-system?
Using the vim-mergetool plugin ( https://github.com/cynix/vim-mergetool ) with a shortcut to toggle the base view was what made it bearable, if not better than VSCode or Idea, to me in neovim. Sadly it doesn't have some smart conflict resolution that is aware of the program like Idea...
-
How to do a git merge?
Let me recommend https://github.com/cynix/vim-mergetool (fork of original tool by samoshkin). Has been a huge help for me
neogit
-
Neovim: creating keymaps in lua
I would use this feature of lazy.nvim in a plugin that I rarely need. Something neogit for example. I can spend hours coding without using it. In that particular case I think is nice to have the option to load it when I actually call it.
-
GitUI
This looks very much like the Noevim plugin I began using about a month ago: neogit[0].
The keybindings were a bit rough, and it took me about an hour of use before I was really comfortable with the overall workflow. Once I was, though, I’ve found it to be much faster than my previous workflow (suspending neovim and using git directly in the shell).
0: https://github.com/NeogitOrg/neogit
-
Is there a discard all option in neogit?
Edit: FYI: I made a feature request and got the answer, that it it possible to visually select the files and discard them like this together.
- Massive Update to Neogit and New Home!
-
What IDEA or Vscode feature/function you want to have in neovim eco-system?
This is what I use for general git interaction and it‘s pretty neat: neogit. Also integrates diffview
-
Magit
For neovim users, there's a work-in-progress clone, neogit: https://github.com/timUntersberger/neogit/
Some of my colleagues use emacs/magit, and after seeing how absolutely lovely the workflow is, I've put in a lot of work over the last few months expanding it. You can check out my fork here: https://github.com/ckolkey/neogit/
One thing I particularly like to tease my emacs' colleagues about is that my magit is faster than theirs thanks to neovim's async capabilities.
- Your favourite Neovim plugins?
-
What do you use for git integration in neovim?
You could use neogit (https://github.com/TimUntersberger/neogit) for basic commands however I have found it's easier / more versatile to just use lazygit in either another tmux tmux window or within neovim itself.
-
Switching from Emacs. My experience
The only thing I truly miss from Emacs is [Magit](https://magit.vc/) since I still consider it the best git wrapper available. It is just too good. Unfortunately [Neogit](https://github.com/TimUntersberger/neogit) is not quite there yet although I hope it makes it at some point. I didn't like [Fugitive]https://github.com/tpope/vim-fugitive), but I ended up finding a good enough workaround by using [Lazygit](https://github.com/jesseduffield/lazygit) through [Toggleterm](https://github.com/akinsho/toggleterm.nvim).
- Neovim vs VSCode Neovim - what are the tradeoffs?
What are some alternatives?
neoconf.nvim - 💼 Neovim plugin to manage global and project-local settings
vim-fugitive - fugitive.vim: A Git wrapper so awesome, it should be illegal
vim-visual-multi - Multiple cursors plugin for vim/neovim
lazygit.nvim - Plugin for calling lazygit from within neovim.
database - Neovim plugins database used by plugnplay
octo.nvim - Edit and review GitHub issues and pull requests from the comfort of your favorite editor
awesome-neovim - Collections of awesome neovim plugins.
lazygit - simple terminal UI for git commands
difftastic - a structural diff that understands syntax 🟥🟩
neovimcraft - website that makes it easy to find neovim plugins
gitsigns.nvim - Git integration for buffers