This is what it should do, even though it doesn't appear to work on OS X
Merge branch 'master' of ssh://github.com/JelleZijlstra/EH