Skip to content

Instantly share code, notes, and snippets.

@meonkeys
Created December 8, 2011 04:26
Show Gist options
  • Save meonkeys/1446112 to your computer and use it in GitHub Desktop.
Save meonkeys/1446112 to your computer and use it in GitHub Desktop.
Rough draft slides for potential LFNW 2012 talk on git

% Git Deep % Jesse Keating and Adam Monsen % April 22, 2012

Intro

  • What we'll cover
  • What we won't cover

Credits

  • Thank you, LFNW, thank you BLUG!

Complex merges

Merge vs. Rebase

Rebase

  • I really do use this every fraking day
  • Fancy name, but really easy to use

Bisect

git-lfnw-2012.html: git-lfnw-2012.txt
pandoc -w slidy -s $< > $@
.DELETE_ON_ERROR:
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment