> IDE/VSCode/vim for editing

To the point on this one, I sometimes find myself running neovim inside the IntelliJ or VSCode terminal, when I need to edit a config file quickly while running scripts in that terminal, or just to edit a file outside the project directory. Or like you, I primarily use the git CLI, because IDEs often use to me unintuitive mappings of GUI buttons to git actions ("what does Synchronize do for git?"), so then it pops open $EDITOR to write my commit message.

I'm similar.

When I need to create a lot of "new" code, I'll usually use nvim. When I need to edit/refactor existing code, I'll more often use atom or vscode.

I like both a lot. When bashing out code that is already reasonably clear in my head, vim works faster and with less "overhead". An ide like vscode works better for me when I need a good global search & replace, or something the ide has plugins for.

vim-fugitive is also a great way to interact with git since you use vim.

I use vim's stdin and stdout redirection to interact with git and can do things like staging or unstaging files or diff hunks and committing from within the editor.

magit for the emacs folk

Truly one of the best new things in emacs in some time. Even better than org mode. Tho I still use command line for check ins and pushes, old habits.