Using Git on Windows is way easier once you find a combination of tools that you’re comfortable with.
I occasionally get asked about my preferred combination Git tools, so decided to write a post about it.
In this blog post you’ll learn about:
- My preferred way of using Git via the command line on Windows
- My preferred Git GUI on Windows and Mac, and the times that I prefer using Git via the GUI instead of the command line
- The tool that I use for diffs, and resolving any Git merge conflict that may occur (including 3-way merges)
- Using Git with SSH authentication on Windows via .bashrc and Bash shell
- My .gitconfig
Using Git on the command line
Prior to switching to mostly Windows development back in 2006, I used Linux nearly exclusively, and still find the Bash shell to be a more comfortable interface than the regular Windows command prompt.
I find the command line generally easiest for for creating commits, rebasing, pushing branches, etc.
Here’s what the Cmder console looks like when you’re using Bash:
When you first open Cmder, the default shell that pops up will be the regular windows CMD shell, wrapped within the Cmder console.
Because the CMD shell is wrapped in Cmder, the interface is a big step up from the regular built-in CMD shell that comes with Windows. You get all the things that you’d expect from a modern console.
To open the Bash shell within Cmder, start by clicking the green plus icon in the lower right of the window, then:
Using Sourcetree as a Git GUI
I use Sourcetree for anything that feels more convenient via a GUI such as browsing the source history, or when I want to add or discard specific sections of specific files to a commit.
Before using SourceTree, I used to use Tortoise Git, which is still around if you want to check it out.
Diffs and 3-way merges via Sourcetree and Beyond Compare
Whenever I need to see diffs, or resolve a merge conflict, rather than continuing on the command line, I switch to Sourcetree, and use it to open Beyond Compare, which is my favorite tool for diffs and 3-way merges.
I can’t quite remember why I switched from WinMerge to Beyond Compare, but both tools are worth checking out to see what you prefer.
Aside from Beyond Compare being great software, one of the things that has kept me using it has been the fact that they have consistently offered free upgrades to the latest version of their product - rather than paying for a new license every year or two, I’m still using my original license which I purchased about 6 years ago.
Here’s an example diff in Beyond compare:
Here’s an example 3-way merge in Beyond compare:
Editing commit messages
I use Notepad++ for editing commit messages, and for interactive rebase:
Using SSH to access Git repos
I use SSH to manage access to my Git repos, and have .bashrc set up to automatically add any ssh keys on startup.
Here’s the contents of my .bashrc file, which sets up ssh with my Github SSH key:
eval $(ssh-agent) ssh-add ~/.ssh/github
Here’s my .gitconfig file which ties everything together, using notepad++ for editing commits, setting up interactive rebases, etc, and Beyond Compare for diffs and merges.
[user] name = Matt email = [email protected] [core] autocrlf = true editor = 'c:/program files (x86)/Notepad++/notepad++.exe' -multiInst -notabbar -nosession -noPlugin [difftool "sourcetree"] cmd = 'C:/Program Files/Beyond Compare 4/BComp.exe' \"$LOCAL\" \"$REMOTE\" [mergetool "sourcetree"] cmd = 'C:/Program Files/Beyond Compare 4/BComp.exe' \"$LOCAL\" \"$REMOTE\" \"$BASE\" \"$MERGED\" trustExitCode = true
Thanks for reading!
I hope this post was helpful. What tools do you use? Any feedback? Is there anything that I haven’t covered that you’d like to more about? Let me know in the comments below