Skip to main content

My Git Setup on Windows

This is kind of a continuation of my earlier post about my terminal/shell on OS X and Linux.

As I was recently preparing for my Git on Windows talk, I naturally started tweaking the setup on Windows as well in the same direction, and I figured I'd share this setup.

Installing Git

Either go with Git for Windows, or Git Extensions if you want more GUI as well as Visual Studio integration. I personally have grown a distaste for TortoiseGit, as it sometimes locks files in my repositories. But it's supposed to be good otherwise (as an alternative for Git Extensions).

Git Extensions

During the Git install, you need to select the scary red option, for integrating Git into Windows cmd-line, if you want to use it from Powershell/Console2 (we'll get back to that later). The cygwin-like Git Bash is not sexy.
Update (30/4 2012)I think you could also wrap Console2 around Cygwin, although I haven't tried this myself yet. This way you can avoid the scary red option. There's also the alternative mintty terminal for Cygwin.
You also get asked how Git should treat line endings. There are three options, you'll need to pick the one that suits you best (you can change it later):
  • Windows style (convert to CRLF on checkout, and to unix on checkin, autocrlf true): Pick this one if you have programs that need to CRLF (notepad, scripts, tools).
  • Checkout as -is, commit unix style (autocrlf input): All your programs can deal with LF just fine. This is the Github recommends this one. 
  • Checkout as-is, commit as-is (autocrlf false): You’re OK with everything ending up like CRLF - this is OK for pure Windows environments. It is not cross platform friendly.

Authing against Github with Putty


It is possible to get away with using the OpenSSH that installs along with Git, but as far as I know that will only work for command-line, and not for GUI tools. The Github docs explain that Putty is not supported for SSH auth, but that's bollocks. It works just fine.

Download and install Putty (you'll want the Windows installer for everything except PuTTYtel option).

If you're unfamiliar with the Putty tools, I'm not going to go too much into it, but you're gonna:
  • Use puttygen for generating a SSH key
  • Run pageant in the background, serving ssh-authentication (for any program that might ask, like Git Extensions, or TortoiseGit)
  • Offer plink to the git command line as an authentication method (GIT_SSH)
When you generate a key in Putty, make sure you have at least 768 bits in the RSA key (2048 is good). Any less, and Github (and probably most other SSH servers) will reject the authentication without any explanation.

Generating a key with putty
After the key is generated, copy and paste the public key into your SSH keys in your Github settings.

Save the private key file as $HOME/keys/id_rsa.pkk or something like that.

Open Putty/Pageant, go Add Key, and select the pkk file you just saved.

Set an environment variable called GIT_SSH to point at C:\Program Files (x86)\PuTTY\plink.exe or wherever you installed Putty/plink.

Open a command line window and do


git clone [one of your github repos SSH urls]

This should work with no problem. If it doesn't work, something has gone wrong in the setup:
  • Pageant isn't running with the right key
  • You didn't set up GIT_SSH properly (echo %git_ssh% to check)
  • You didn't paste the key correctly into the Github settings
  • You generated a key with less than 768 bits
Update (01.05.2012): If you run into this error message: 
The server's host key is not cached in the registry. Youhave no guarantee that the server is the computer youthink it is. 
It means that Github's SSH server needs to be authorized (I actually only noticed this when cloning from Gitorious, never saw it from Github). People usually solve this by doing an ssh [email protected], and answering yes when prompted, but since Putty keeps its authorized keys in a different place, you have to: 
  • Open Putty
  • Enter [email protected] in the Host Name field
  • Pick Never under 'Close window on exit'
  • Select Open. 
  • Click yes when the question pops. You should see something like this:
Using username "git".Authenticating with public key "rsa-key-20120429" from agentServer refused to allocate ptyHi tfnico! You've successfully authenticated, but GitHub does not provide shell access. 
Now cloning should work.

Note that if you want to skip SSH entirely (I've actually seen company firewalls that block SSH), and just use Smart HTTP authentication (https). You'll get asked for password each time, so specify the credentials in your home-directory, in a file called _netrc like this:


machine github.com
login tfnico
password sekrit


Note that the password value is not very friendly towards special characters. But hey, if you wanted security, you should've gone with SSH instead.

The console window

First thing up is Console2. It's a wrapper of the normal command-line in Windows, which still, oh so many years later, sucks really hard. Console2 has tabs, sensible copy/paste, and nicer color options. Scott Hanselman has pretty much summed up the useful tweaks, and I won't add much else than a screenshot.

Console2 with Poweshell & git-posh

Key steps are:
  • Paste this Solarized color theme into your Console2 config
  • Pick a nicer font (Lucida console?)
  • Use Powershell as shell (because of posh-git)
  • Remove unnecessary toolbars and menus
  • Enable Copy-on-select
  • Remap New Tab (Ctrl + T) and Paste (Ctrl + V)
  • Install posh-git (shows repo status in PS1, requires Powershell)
The posh-git prompt is a bit sluggish (although much better than the first time I tried it), but all in all, Console2 is really comfy, and this setup works pretty sweet. 

Popular posts from this blog

Encrypting and Decrypting with Spring

I was recently working with protecting some sensitive data in a typical Java application with a database underneath. We convert the data on its way out of the application using Spring Security Crypto Utilities. It "was decided" that we'd be doing AES with a key-length of 256, and this just happens to be the kind of encryption Spring crypto does out of the box. Sweet!

The big aber is that whatever JRE is running the application has to be patched with Oracle's JCE in order to do 256 bits. It's a fascinating story, the short version being that U.S. companies are restricted from exporting various encryption algorithms to certain countries, and some countries are restricted from importing them.

Once I had patched my JRE with the JCE, I found it fascinating how straight forward it was to encrypt and decrypt using the Spring Encryptors. So just for fun at the weekend, I threw together a little desktop app that will encrypt and decrypt stuff for the given password and sa…

Managing dot-files with vcsh and myrepos

Say I want to get my dot-files out on a new computer. Here's what I do:

# install vcsh & myrepos via apt/brew/etc
vcsh clone https://github.com/tfnico/config-mr.git mr
mr update

Done! All dot-files are ready to use and in place. No deploy command, no linking up symlinks to the files. No checking/out in my entire home directory as a Git repository. Yet, all my dot-files are neatly kept in fine-grained repositories, and any changes I make are immediately ready to be committed:

config-atom.git
    -> ~/.atom/*

config-mr.git
    -> ~/.mrconfig
    -> ~/.config/mr/*

config-tmuxinator.git  
    -> ~/.tmuxinator/*

config-vim.git
    -> ~/.vimrc
    -> ~/.vim/*

config-bin.git   
    -> ~/bin/*

config-git.git          
    -> ~/.gitconfig

config-tmux.git  
    -> ~/.tmux.conf    

config-zsh.git
    -> ~/.zshrc

How can this be? The key here is to use vcsh to keep track of your dot-files, and its partner myrepos/mr for operating on many repositories at the same time.

I discovere…

Always use git-svn with --prefix

TLDR: I've recently been forced back into using git-svn, and while I was at it, I noticed that git-svn generally behaves a lot better when it is initialized using the --prefix option.

Frankly, I can't see any reason why you would ever want to use git-svn without --prefix. It even added some major simplifications to my old git-svn mirror setup.

Update: Some of the advantages of this solution will disappear in newer versions of Git.

For example, make a standard-layout svn clone:

$ git svn clone -s https://svn.company.com/repos/project-foo/

You'll get this .git/config:

[svn-remote "svn"]
        url = https://svn.company.com/repos/
        fetch = project-foo/trunk:refs/remotes/trunk
        branches = project-foo/branches/*:refs/remotes/*
        tags = project-foo/tags/*:refs/remotes/tags/*

And the remote branches looks like this (git branch -a):
    remotes/trunk
    remotes/feat-bar

(Compared to regular remote branches, they look very odd because there is no remote name i…

Considerations for JavaScript in Modern (2013) Java/Maven Projects

Disclaimer: I'm a Java developer, not a JavaScript developer. This is just what I've picked up the last years plus a little research the last days. It's just a snapshot of my current knowledge and opinions on the day of writing, apt to change over the next weeks/months.

We've gone all modern in our web applications, doing MVC on the client side with AngularJS or Ember, building single-page webapps with REST backends. But how are we managing the growing amount of JavaScript in our application?
You ain't in Kansas anymore So far we've just been doing half-random stuff. We download some version of a library and throw it into our src/main/webapp/js/lib, or we use it from a CDN, which may be down or unreachable when we want to use the application..

Some times the JS is minified, other times it's not. Some times we name the file with version number, other times without. Some times we get the latest library of master branch and name it with the commit-id in the fi…

Microsoft ups their Git efforts another notch

This week Microsoft announced first class Git support embedded in the coming version of Visual Studio.

Now, it's not completely shocking. We could have seen it coming since Microsoft started offering Git repos on CodePlex, and more recently offering a Git client for TFS. In any case, these are some big news. Scott Hanselman weighs on some features and some more background here.

For those who are a bit unaware of what the Git situation on Windows looks like these days, I've dotted down these notes:
Some explanation on these:

msysGit has long been The Way to use Git on Windows. It's basically a port of Git itself, so it's a command-line tool.GitExtensions (includes Visual Studio integration), TortoiseGit, Git Shell, posh-git and most other tools are powered by msysGit.libgit2 is a native library for doing Git stuff. It is developed completely separate from Git itself. The above tools could (and should) probably use libgit2 instead of hooking onto and around msysGit.Github…