I have some handy aliases so I use CLI most of the time. And on my gaming keyboard I have the side macro keys set to:
- git status
- git diff
- git add .
- git commit - m """ (with the cursor left into between quotes)
- git commit -am ""
For merge conflicts I'll use whatever the IDE provides.