Gitting More Out of Git

Jordan Kasper (StrongLoop)
1:45pm–3:15pm Monday, 04/20/2015
Development tools
Location: Salon 1/2
Average rating: ****.
(4.79, 14 ratings)
Slides:   1-PDF 

THIS TUTORIAL HAS REQUIREMENTS AND INSTRUCTIONS LISTED BELOW

Having trouble groking Git? Not sure what the difference between merging and rebasing is? Wondering what you would ever use a “cherry-pick” for? We’ll cover these topics and more in this talk, helping attendees get past Git novice and on their way to Git master.

We’ll do a short overview of git, then jump into branching strategies, commit amending, stashing, cherry-picking, and yes, merging versus rebasing. This is not an introductory talk, we’ll dive into these topics and play with some sample commands to get attendees up to speed quickly. Okay, maybe you won’t be a guru after one conference session, but attendees will have a better understanding of how to play nicely with others in the same Git repository and how to fix common (and not so common) issues in Git.

TUTORIAL REQUIREMENTS AND INSTRUCTIONS FOR ATTENDEES

Basic git and running commands on the command line.

Attendees should have a git client installed which gives them access to a command line interface (CLI).

Photo of Jordan Kasper

Jordan Kasper

StrongLoop

Shortly after it arrived at his home in 1993, Jordan began disassembling his first computer – his mother was not happy. She breathed more easily when he moved from hardware into programming, starting with BASIC. Jordan’s experience includes startups, companies large and small, and universities, working in many languages from C++ to Natural to JavaScript. He contributes to many open source projects and participates in local user groups, barcamps, and hackathons. Jordan’s primary mission for the last 10 years has been to evangelize technology of all sorts and share what he has learned to help others grow. He currently works as a Developer Evangelist for StrongLoop, a leader in Node.js API technology from design to development to scaling and monitoring. In his down time he enjoys puzzles of all sorts and board games!

Comments on this page are now closed.

Comments

Picture of Jordan Kasper
Jordan Kasper
04/20/2015 9:30am PDT

Justin (and all): The random drawing app is located here:

https://github.com/jakerella/random-draw

Justin Murdock
04/20/2015 8:53am PDT

Jordan, I couldn’t find your node drawing app on your github —> github.com/jakerella
That was a fun little app and a good first node app that I’d like to fork

Eliazer Braun
04/20/2015 7:38am PDT

You can specify a revision for git blame to look back starting from (instead of the default of HEAD); fe25b6d^ is the parent of fe25b6d.

git blame L10,+1 fe25b6d^ - src/options.cpp

Eliazer Braun
04/20/2015 7:31am PDT

You can turn a stash into a branch if you feel it’s important enough:
http://stackoverflow.com/a/11269780/56449