As others have stated, your habits can be much better in this regard if you use a git GUI client that allows you to stage only certain lines / hunks with ease.

As others have stated, your habits can be much better in this regard if you use a git GUI client that allows you to stage only certain lines / hunks with ease. I personally didn't like git GUIs and only ever used it from the command line until the release of Sublime Merge[1], which imo is hands down the best git client. Exactly what I need, not loads of extra cruft. Plus the performance you expect from the people that made Sublime Text. I almost immediately paid for a license after I started using it and still actually use git from the command line for a variety of other things, but for staging changes Sublime Merge is invaluable. [1] https://www.sublimemerge.com/ https://www.sublimemerge.com/