benschwarz

# Put this file in your config/initializers directory and behold a tastier auto_link!

module ActionView
  module Helpers
    module TextHelper
      # Use auto_link and friends from Rails 3. They do the right thing (tm).

      remove_const(:AUTO_LINK_RE) if defined?(AUTO_LINK_RE)
      AUTO_LINK_RE = %r{
          ( https?:// | www\. )

benschwarz

Git is a tool that can confuse. Some feel intimidated by it, which is a shame, because git's design is stunningly simple: basic building blocks, and very consistent behaviour. It's a design you can always reason about to work things through, once you get the starting point.

We'll cover the theory, to nail those first principles -- important stuff, and interesting too, but we won't get bogged down in it. After all, the aim is a new tool in your toolbox.

We'll concentrate instead on what makes that stuff important: it's the bread and butter of day-to-day git. Trees, refs, rebasing, branches & tags, and more.

If you've ever thought "what the hell did git just do?" or "Oh dear, this repo is really broken now", then this workshop is for you.

This is a hands-on workshop. Bring your laptop to follow along.

benschwarz

body {
	margin: 0 auto;
	margin-top: 5em;
	width: 760px;
}

.pulse {
	width: 50px;
	height: 50px;
	border-radius: 50%;

benschwarz

body { padding: 10em; }
textarea { min-width: 40em; }

div {
  padding: 2em;
  border-left: 5px solid #c1c2c4;
  border-right: 5px solid #c1c2c4;  
  position: relative;
}