Presenting Git for Windows again

A couple of years back I did a talk for the local .Net user group on how to use Git on Windows. I also wrote about my Git setup on Windows. Even though I don't do a lot of work in this environment, I figured I could contribute a lot of good tips and experience as a somewhat seasoned Git user.

Since then a few things have happened, so next week I'm heading back to Bonn-to-Code.Net to refresh their memories on what Git is about, and what has changed since last time.

Update: Talk done. Recording and slides can be found here.

So what has changed since last time then?

Microsoft has fully adopted Git as their (second) version control system of choice.
Git projects can be hosted inTeam Foundation Server, as well as on VisualStudio.com (which is kind of like TFS in the cloud).
You can operate Git repositories from within Visual Studio (without installing any extra Git tooling, thanks to libgit2).

On the desktop, you can and should still install MsysGit if you're going to use Git - Visual Studio 2013 even assists you in doing so - it will suggest to install it when you init or clone a Git project, and semi-automatically install it for you if you want.

What you maybe don't need anymore is the Git Extensions tool for Visual Studio. Git Extensions is a good standalone Git GUI, but I don't think you'll be needing it inside Visual Studio anymore (unless you are on something older than Visual Studio 2012, which supports Git).

Another thing that has changed is that HTTPS has become much more popular and accepted for Git authentication. As a result, I'll completely skip the awkward SSH setup instructions in my talk (have a look at my old post if you still want to get this working).

Finally, Git usage is now way up from where it was two years ago. Based on some rough estimates from open source trackers, we can assume that Git is nearly at Subversion's level in open source. I imagine that most businesses out there with a tad of innovation have done some Git experimenting by now.

Oh, and I now prefer cmder (based on ConEmu) over Console2. Hat-tip to Hanselman's tool list.

Most of the things I know about Microsoft's Git involvement I learned from Martin Woodward when I had him on GitMinutes. There's a lot of interesting history and information in that episode so do have a listen if you get the chance.

Comments

Open source CMS evaluations

I have now seen three more or less serious open source CMS reviews. First guy to hit the field was Matt Raible ( 1 2 3 4 ), ending up with Drupal , Joomla , Magnolia , OpenCms and MeshCMS being runner-ups. Then there is OpenAdvantage that tries out a handful ( Drupal , Exponent CMS , Lenya , Mambo , and Silva ), including Plone which they use for their own site (funny/annoying that the entire site has no RSS-feeds, nor is it possible to comment on the articles), following Matt's approach by exluding many CMS that seem not to fit the criteria. It is somewhat strange that OpenAdvantage cuts away Magnolia because it "Requires J2EE server; difficult to install and configure; more of a framework than CMS", and proceed to include Apache Lenya in the full evaluation. Magnolia does not require a J2EE server. It runs on Tomcat just like Lenya does (maybe it's an idea to bundle Magnolia with Jetty to make it seem more lightweight). I'm still sure that OpenAdvant

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? Yeoman 's logo (not necessarily the conclusion of this blog post) 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

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 o

What I've Learned After a Month of Podcasting

So, it's been about a month since I launched GitMinutes , and wow, it's been a fun ride. I have gotten a lot of feedback, and a lot more downloads/listeners than I had expected! Judging the numbers is hard, but a generous estimate is that somewhere around 2000-3000 have listened to the podcast, and about 500-1000 regularly download. Considering that only a percentage of my target audience actively listen to podcasts, these are some pretty good numbers. I've heard that 10% of the general population in the western world regularly listen to podcasts (probably a bit higher percentage among Git users), so I like to think I've reached a big chunk of the Git pros out there. GitMinutes has gathered 110 followers on Twitter, and 63, erm.. circlers on Google+, and it has received 117 +'es! And it's been flattr'ed twice :) Here are some of the things I learned during this last month: Conceptually.. Starting my own sandbox podcast for trying out everythin

Git Stash Blooper (Could not restore untracked files from stash)

The other day I accidentally did a git stash -a , which means it stashes *everything*, including ignored output files (target, build, classes, etc). Ooooops.. What I meant to do was git stash -u , meaning stash modifications plus untracked new files. Anyhows, I ended up with a big fat stash I couldn't get back out. Each time I tried, I got something like this: .../target/temp/dozer.jar already exists, no checkout .../target/temp/core.jar already exists, no checkout .../target/temp/joda-time.jar already exists, no checkout .../target/foo.war already exists, no checkout Could not restore untracked files from stash No matter how I tried checking out different revisions (like the one where I actually made the stash), or using --force, I got the same error. Now these were one of those "keep cool for a second, there's a git way to fix this"situation. I figured: A stash is basically a commit. If we look at my recent commits using git log --graph --