What if I told you you didn’t have to use just one git client? I use 5, and here’s why:

1. Command line – Sometimes it’s the simplest fastest way to do something.
2. Lazygit – Ultra-fast workflow for many git tasks, especially rebasing, reordering, rewriting commits. Quickly doing fixup commits and amending into arbitrary commits feels magical. Custom patches are even more magical.
3. Fork (Mac app) – Great branch GUI view. Nice drag and drop staging workflow.
4. Sublime Merge – Good for code review, can easily switch between the diff and commit message just by scrolling, no clicks.
5. Gitk – Great blame navigator.

One you try one of these GUIs, you’ll never go back to git add -p.