Line-by-line commits in Sublime Merge are much easier to do. Also the timeline view if you're pressured into "gitflow" and such things.