4 ms·

I love neovim but I don’t have a good replacement for the git plugin of vscode. I haven’t found my way to replicating that experience in neovim. I tried lazygit

I love neovim but I don’t have a good replacement for the git plugin of vscode. I haven’t found my way to replicating that experience in neovim. I tried lazygit but I find the diff viewer hard to understand and navigate. Diff view (https://github.com/sindrets/diffview.nvim https://github.com/sindrets/diffview.nvim) might be it, but I haven’t made the time to install a newer version of git from source (Debian…)

christophilus 4y ago
I'm the same. For the most part, I use a nice terminal git diff (I forget which-- not in neovim), and I hop around in neovim based on what I see there. I do sometimes open Codium just to navigate a large diff, and it always makes me a little sad.
- petepete 4y ago
  Similarly, I use diff-highlight 99% of the time because it works flawlessly with all of git diff's arguments (including --word-diff) but break out Meld for big content-heavy changes. https://meldmerge.org/ https://meldmerge.org/
minusf 4y ago
have you tried fugitive? the vimcast videos about it can be life changing.
aussiesnack 4y ago
vim-fugitive is ergonomically great for routine stages and commits. DiffView is good but there's no point denying GUI diff viewers are better than text ones, so I use one (meld or sublime-merge), which does mean launching a separate tool. That's fine for my limited uses (quick visual overviews, or fixing merge conflicts).
emerongi 4y ago
Gitsigns was good enough for my workflows: https://github.com/lewis6991/gitsigns.nvim https://github.com/lewis6991/gitsigns.nvim Besides showing the git signs in the gutter, it can do staging, diffing, navigation between hunks, line blame, can show deleted lines etc. If you have more advanced workflows, it might not be enough though. I use lazygit quite often as well.
bradwood 4y ago
Have you tried Fugitive?
0x008 4y ago
https://github.com/TimUntersberger/neogit https://github.com/TimUntersberger/neogit & DiffView if I want everything inside neovim. If I am just living in the terminal, I like to use a mix of https://github.com/extrawurst/gitui https://github.com/extrawurst/gitui (doesn't support signed commits yet!) and https://github.com/Wilfred/difftastic https://github.com/Wilfred/difftastic which provides amazing semantic diffs.

christophilus 4y ago

I'm the same. For the most part, I use a nice terminal git diff (I forget which-- not in neovim), and I hop around in neovim based on what I see there. I do sometimes open Codium just to navigate a large diff, and it always makes me a little sad.

petepete 4y ago
Similarly, I use diff-highlight 99% of the time because it works flawlessly with all of git diff's arguments (including --word-diff) but break out Meld for big content-heavy changes. https://meldmerge.org/ https://meldmerge.org/

minusf 4y ago

have you tried fugitive? the vimcast videos about it can be life changing.

aussiesnack 4y ago

vim-fugitive is ergonomically great for routine stages and commits. DiffView is good but there's no point denying GUI diff viewers are better than text ones, so I use one (meld or sublime-merge), which does mean launching a separate tool. That's fine for my limited uses (quick visual overviews, or fixing merge conflicts).

emerongi 4y ago

Gitsigns was good enough for my workflows: https://github.com/lewis6991/gitsigns.nvim https://github.com/lewis6991/gitsigns.nvim Besides showing the git signs in the gutter, it can do staging, diffing, navigation between hunks, line blame, can show deleted lines etc. If you have more advanced workflows, it might not be enough though. I use lazygit quite often as well.

bradwood 4y ago

Have you tried Fugitive?

0x008 4y ago

https://github.com/TimUntersberger/neogit https://github.com/TimUntersberger/neogit & DiffView if I want everything inside neovim. If I am just living in the terminal, I like to use a mix of https://github.com/extrawurst/gitui https://github.com/extrawurst/gitui (doesn't support signed commits yet!) and https://github.com/Wilfred/difftastic https://github.com/Wilfred/difftastic which provides amazing semantic diffs.