You are now in FULL VIEW

The Git Parable
Recorded at:

| by Johan Herland Follow 0 Followers on Aug 03, 2013 |

A note to our readers: You asked so we have developed a set of features that allow you to reduce the noise: you can get email and web notifications for topics you are interested in. Learn more about our new features.


Johan Herland explains how Git does branching and merging in a distributed (and partially disconnected) environment, how to rewrite a commit history, and why staging is useful.

Sponsored Content


Johan Herland is a software developer at Cisco in Oslo, Norway, developing the next generation of video conferencing solutions. Johan started meddling with distributed version control and Git in 2007, and has been heavily involved in migrations from CVS to git (at Opera) and Subversion to Git (at Cisco). He also occasionally contributes patches to Git itself.

ACCU is an organisation for anyone interested in developing and improving programming skills. ACCU welcomes everyone who is interested in any programming language. ACCU supports its members by hosting mailing lists, running a yearly conference, publishing journals and organising online study groups.

Login to InfoQ to interact with what matters most to you.

Recover your password...


Follow your favorite topics and editors

Quick overview of most important highlights in the industry and on the site.


More signal, less noise

Build your own feed by choosing topics you want to read about and editors you want to hear from.


Stay up-to-date

Set up your notifications and don't miss out on content that matters to you