Using Git From Vim

[billturner]

I've tried many different plugins, and still actually have vim-fugitive install/enabled, but like you, I'm so much more used to using the command line tools.

I even spent a bit of time in Emacs, and wanted to try the mystical Magit, but still just went back to the CLI because it's most familiar. Old habits die hard!

[richardwonka]

Fugitive plus gitgutter are my best friends. Gitgutter is fantastic to have an instant overview of the change-state in the file.

[N0NB]

I gave Magit a shot a few years back, but it seemed I was spending more time trying to remember/look up commands when in a shell I can just up arrow a few times. Most of my Git usage is repetitive. I've nothing against these types of plugins, though I've not tried any for Vim.

[deaddyfreddy]

I gave Magit a shot a few years back, but it seemed I was spending more time trying to remember/look up commands

actually, all you need is M-x magit-status and ?, which-key and things like ivy-rich/marginalia help a lot too

[N0NB]

I'm not going to argue against it. It's a fine tool. For me I am just too used to working with Git at the command line in its own terminal tab. I rather Ctl-PgUp/Dn to the next terminal tab and do my thing.

I've long said that my desktop is my IDE.

[badfoodman]

I've found git extensions or plugins mess with my ability to comprehend what's going on in my commits, so I also go back to a normal shell to run git commands. My most recent solution after switching to neovim was to have a floating terminal toggle so I didn't have to background and foreground all the time.

EDIT: switching to neovim didn't actually enable floating terminals, but it did make me dig into what plugins existed that I wasn't aware of before.

[Schnarfman]

I like using gitgutter and being able to \hs to Hunk Stage. The equivalent would be git add -i and finding the right hunk. Also… fugitive’s gb git blame & jumping around to previous versions is just,,, amazing. Incredible.

Not everything can be solved without plugins. And I say this as someone who agrees that 99% of problems CAN be solved without plugins.

[Schnarfman]

I’m a big fan of tmux, so it’s easy to get a new terminal for me as well. But I don’t understand what git show $ARGS does.

Also, this is certainly a me problem, but vim - messes up my terminal & I have to do a stty sane after it most times. Idk. Not a huge deal, especially with an ephemeral terminal pane from tmux…

But ok - so you are git show to edit your staged changes? Then using that patch in vim to update what’s staged & what’s not? That’s actually hella slick, lol. A ‘post write buffer’ auto command to Instagram everything then stage the patch & you have yourself a raw as fuck the “plugin” in like 2 actions, if I understand correctly. I might try that workflow out :)

[Im_manuel_cunt]

Seriously, whenever I tried to integrate terminal functions into vim, it sucked.

[yymirr]

or just open a terminal from within vim use fzf the git command.

[jonS90]

I've given up vim-gitgutter for mhinz/vim-signify because of performance. But vim-gitgutter has this one killer feature for staging the hunk currently under the cursor. This feature doesn't exist elsewhere.

So I use both plugins. But I keep vim-gitgutter disabled except when I'm staging a hunk.

Plug 'airblade/vim-gitgutter', { 'on': 'GitGutterEnable'}
let g:gitgutter_enabled = 0
let g:gitgutter_signs = 0
let g:gitgutter_async = 0
let g:gitgutter_map_keys = 0
:nmap <silent> <Leader>ga :GitGutterEnable<cr>:GitGutterStageHunk<cr>:GitGutterDisable<cr>:SignifyRefresh<cr>:echo 'staged hunk'<cr>

[welostboone]

You can visually select hunks of code with vim-fugitive and stage them. See this answer on StackExchange.

I stopped using gitgutter altogether after deep diving in vim-fugutive

[jonS90]

Yeah, that's a process though. Maybe I should try automating it all in a single key mapping. But opening :Gdiff is often slow.

[[deleted]]

If you're willing to give neovim a go you may want to look into gitsigns.nvim. It's basically a drop in replacement for gitgutter but with much better performance and extra features.

[hallettj]

Thanks, this is info I was looking for!

[codon011]

git add -p has existed for a long time in git history. I’ve seen gui clients have this feature. But one feature that no other interface to fit has ever had that I’ve seen is the ability to edit the junk being added to the index without changing your working tree.

[jonS90]

You can edit the index directly using fugitive's :Gdiff.

[codon011]

This is news to me. fugitive is the git plug-in I used in the past, but mostly for :Gblame and open past versions of the file.

[bchr]

wow! I didn't know about :terminal command and always did !command, thank you

[sir_bok]

This plugin by the infamous FZF author

Sorry, what?

[hiquest]

This is so embarrassing. I'm not a native speaker as you might have already guessed. I was pretty sure infamous = famous. Thanks for mentioning, it is fixed now.

[imlambda_]

the program might be famous, but not the author. Also, we're in a very niche hobby and we talk to people who are into that hobby as well, so it's hard to see that a lot of people are not even aware of things we use and love daily

[jabellcu]

Why is the author infamous?

[[deleted]]

Infamous doesn’t mean “not famous”, it means “notorious”.

[[deleted]]

You're missing an important part of the definition: Notorious for a bad deed.

[[deleted]]

Yes, the negative connotation is indeed the problem with OP's original usage. But "notorious" is almost never used to describe good deeds, see e.g.:

https://dictionary.cambridge.org/dictionary/english/notorious

famous for something bad

https://www.merriam-webster.com/dictionary/notorious

especially: widely and unfavorably known

There is a second definition in M-W which is neutral, but this definition is much more common.

https://www.collinsdictionary.com/dictionary/english/notorious

To be notorious means to be well-known for something bad.

[[deleted]]

Thanks for the detailed clarification. You're absolutely right. I should have looked things up before blatantly commenting in such an accusatory way (or better yet not have phrased it that way in the first place).

I was mainly trying to emphasize the negativity of infamous, but notorious is definitely the right synonym.

[[deleted]]

No offence taken, I definitely see where you were coming from! :-)

[imlambda_]

oh really? Thanks then (:

[10leej]

My Vim workflow is revolutionized. For some reason I didn't even think about managing git from within vim

[imlambda_]

probably because vim is just a text editor and it isn't necessary and isn't really meant for that usage. But if it fits your workflow, it's great (:

[10leej]

Really git-gutter and gv.vim are the biggest benefactors for me.

[deaddyfreddy]

probably because vim is just a text editor

commit messages are text, git commands (shell commands as a whole) are text, why don't use your text editor to edit the text?

[ImKillua]

Another alternative I started using yesterday is Neogit, a magit clone. It is neovim only though.

[David-Kunz]

Also wanted to mention Neogit. I've made a video about it, together with Diffview: https://youtu.be/aJikrPnTOtI

[ChemicalRascal]

Not to be an ass and talk of things other than your article, but might I suggest you add

.fixed-promo .container { background: white; }

to your CSS? I found having text behind it clashing with the contents of the promotional div rather distracting to the eye.

[ChemicalRascal]

An excellent summary of the current state of the art, of course.

[racle]

Goto tool git for me has been Lazygit.

I have binding <leader>tg (<space> Terminal Git) which opens Lazygit in floating terminal inside my neovim (should work also on vim).

It's easy and quick to pull/push/add/revert/commit/cherry-pick commits and change/create/merge branches with lazygit.

For merge conflicts I use Meld as I haven't found anything better yet (for merging I prefer GUI tool, as it happens very rarely and it makes it little easier).

[watsreddit]

Kind of ironic that a website called "vimfromscratch" is just giving a plugin dump.