I use this on Mac, it looks like there's a Windows version as well: https://www.sourcetreeapp.com/