[dvirsky]

I use both with git, nothing wrong with that. A GUI client for committing which allows me to better look at diffs and makes selecting files for staging easier, not having to do `git status` all the time; and the command line for everything else - pulls, merges, rebases, cherry picking etc etc.

[seanp2k2]

You might also like: https://github.com/magicmonty/bash-git-prompt

Basically shows you 'git status' at a glance, all the time. More for bash people: https://github.com/Bash-it/bash-it (similar to ooh my zsh)

https://github.com/alebcay/awesome-shell#for-developers

PyCharm / any IntelliJ-based IDE, Atom, vim, emacs etc can also all nicely show git status of your current project. I'd suggest one of those as well in whatever flavor of editor you prefer.

[dvirsky]

I'm using mostly IntelliJ / PyCharm and Atom which indeed show me that status. I usually commit either with IntelliJ directly (though sometimes it's too inclusive which is annoying), or with gitg.

[ElegantGiraffe]

My current workflow makes extensive use of these commands:

  git add --patch
  git commit -v

The --patch option allows you to interactively select which changes to add to the index. It also applies to other commands like checkout or reset.

The -v flag shows a diff of what will be committed in the editor.