I use Tower 2 for git.
Codekit for preprocessing and minification and whatnot.
Tower always has a codekit.config item that needs to be stashed/staged every few mins. It’s annoying and I don’t feel it is needed unless something actually has changed. BUT I could be wrong!