I have been using Git now for nearly a year. In that time I have tried many tools with Visual Studio 2012/21013. What follows is my preferred setup for Git.

1. Git

   This will install git for windows. It also includes the command line tool as well as git-gui.

2. Windows Credential Store for Git

   This will come in handy when you start pushing and pulling from GitHub repos. This tools uses the Windows Credential Manager with the defined Git credential API.

3. Conemu-Maximus5

   This is great tool. As anyone who has used windows and its command-line tools will tell you. Best way to configure this tool is to select the Developer build, when you open it up for the first time. This will configure all the prompts like cmd, powershell. You can then switch back to the stable version.

4. Posh-git

   Check out the readme file. It explains it very well. Trust me, you definitely want this if you plan to use git from command-line.

5. Compare Tool

   If you do not not have paid tool for comparing files. I recommend Diffmerge, as it is a free tool. I have used this for several years without any issues.

6. Some usefull Git aliases

   • ahead = log –stat origin/master..HEAD : Check what commits have not been pushed to remote branch.
   • newpush = push -u origin HEAD: Push a local branch to remote server.
   • tagpush = push –tags: Push a newly created tag to remote server.

Would love hear what other people have for using Git on windows.