Facilitating the Spread of Knowledge and Innovation in Professional Software Development

Write for InfoQ


Choose your language

InfoQ Homepage Presentations The Git Parable

The Git Parable



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.


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.

About the conference

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.

Recorded at:

Aug 03, 2013

Hello stranger!

You need to Register an InfoQ account or or login to post comments. But there's so much more behind being registered.

Get the most out of the InfoQ experience.

Allowed html: a,b,br,blockquote,i,li,pre,u,ul,p

Community comments

  • decent try

    by Nilesh Thali,

    Your message is awaiting moderation. Thank you for participating in the discussion.

    i have no doubt that Johan is a cat at this stuff, but the presentation didn't engage me for the following 3 reasons:
    1. it really didn't feel like a parable. there was a very loose story initially, but disintegrated into pure technical instruction very rapidly.
    2. due in large part to the apparent lack of a wireless pointer/slide-advancer, Johan had to shuffle between the screen and his computer, making for a stop-go delivery
    3. very long. with more rehearsing and editing, this could be done in 30-45 mins instead of 85 mins, which will help ADD/ADHD people like me :)

  • I saw a first few minutes

    by Richard Richter,

    Your message is awaiting moderation. Thank you for participating in the discussion.

    Luckily speaker stated his source - and you can actually read that one and you'll get the same without the pictures. I don't say it's necessarily bad to adapt story of somebody else (credit is there), but then it should be a good performer. Here the work with microphone is not mastered at all and a lot of reading (so it seems). Maybe the rest is better, but for me it was just a pointer to that blog. Thanks for that.

  • Re: decent try

    by Stephan Kennedy,

    Your message is awaiting moderation. Thank you for participating in the discussion.

    Concerning your 3rd point: in fact he does finish the presentation in a little over 45 minutes. The rest is a rather interesting question/answer session. Unfortunately the questions are almost impossible to hear, nevertheless Johan gives some good advice.
    Also I found the slides rather good. The original post by Preston-Werner is text only.

  • Very interesting talk

    by Xavier Nodet,

    Your message is awaiting moderation. Thank you for participating in the discussion.

    Yes, a remote command for the slides would be nice. And sometimes there is some noise in the mic. Repeating the questions would have been helpful. All valid remarks...

    But this was a very interesting talk nevertheless! Easier to follow than the blog entry that doesn't have any picture...

Allowed html: a,b,br,blockquote,i,li,pre,u,ul,p

Allowed html: a,b,br,blockquote,i,li,pre,u,ul,p