Coda 2, released a few years ago, brought a lot of git-related changes. Things like branching, merging, and committing are integrated in the UI. Personally, I like to have a terminal window open in Coda for git, but the integrated solution works reasonably well.