I have a license for Working Copy, so I use that alone with shortcuts, but I’m always interested in a solution with fewer parts.