Magit, an emacs package to control git. It's not pretty, and certainly not conventional, but very efficient and discoverable.