I gave a presentation earlier today on Git at the Groovy and Grails GR8Conf US 2012 conference.
The GR8Conf was named for the 8 groovy-based technologies starting with the letter “G” that were popular when the conference first started 2 years ago (I think they were Groovy, Grails, Gradle, Griffon, Gant, GPars, Gaelyk, and…? Maybe GContracts or Geb?). I don’t think that Git was one of the 8 technologies the conference was named for, but it probably should be. All of the ones listed have repositories out on GitHub and you need to know Git to be able to contribute and checkout the source.
The presentation is titled “Git Core Concepts…or: how I learned to stop worrying and love the reflog” and it can be found out on GitHub.
There’s also a repository with all of the presentations collected for the entire conference that Shaun Jurgemeyer (one of the main conference organizers) is putting together.
Thanks to Shaun and everyone else for putting on a fun conference this year. It was fun seeing a lot of familiar people and putting some faces to those I’ve only interacted with virtually in the past.
I zipped through your prez on git … nice stuff. I noticed you listed tower as sort of the ideal choice and sourcetree as a nice free alternative for others not on osx. I’m on osx and I’ve been using sourcetree for about a week. I’m just curious since you’ve used both, why tower might be worth shelling out the duckets vs sourcetree? I’m interested in this because my work colleague is mocking me with his great jetbrains git integration tool that he can context click and get file specific history (log) information for quickly :( … I’m a sublime text 2 (ex Vim) user and I must get my git integration up to snuff or face potential shame!
@Rob Levin
I don’t actually have a ton of sourcetree experience. I started out with Tower because sourcetree wasn’t out at the time.
My workflow changes between sublime text 2 (I’m also an ex Vim user) and IDEA. I think the git integration in IDEA actually kind of sucks and is very buggy, so even when I’m working in IDEA, I still use Tower for the majority of my git interaction.
I find the history tree very useful in Tower. I also find the branch/tag/remote/stash sidebar to be very useful for quickly navigating a project. The merge conflict flow (with kdiff3 integration) also does a nice job of letting you know what you’ve got left to work on.
It could be that sourcetree has come to parity on these features, but I’ve already got the tower license so don’t have a reason to switch.