I use emacs's magit, which is a great labor-saver, but I don't think it protects you from the need to understand the basics of how git represents your history.