Git: Beyond the Basics

gitbeyondthebasics

Thursday, August 2, 12

John Bohn@jjbohn

Developer at OpenSkycurated social commerce

gitwhat is

git is fast and lightweightfree/open sourcedistributedcrazy simple

initbranchaddcommitmerge

Almost any VCS works does this(more or less)

What is special about git?

Interactivity

git add --patchgit add --interactive

Arduino Example

Change Blink

- Two logical changes- Don’t want to bother undoing one- Can’t git add . or git add [file]

git add --patch

git add --patchCommit the change

git add --patchStage other changes

Diff is now empty (everything is staged or commited)Thursday, August 2, 12

git stash

is super boring

until you throw some flags at it...

git stash --no-keep-indexgit stash --keep-index

git stash --patchgit stash --include-untracked

My Favorites

Finding these commands is just a matter of digging

git anything --help

git resetis not

git revert

git reset --soft [sha]git reset --hard [sha]git reset --mixed [sha]

You can also:git reset --patch(but not with those modes)

Bisectingaka: Finding a commit

that screwed things up.

Bisecting

7b35b 912969680d2ab1f c6d43

6 Commits - One BugWe know that 7b35b is goodWe know that cfc332 is badBut we have no idea where the bug was introduced

cfc332

Bisecting

7b35b 912969680d2ab1f c6d43

Tell git what is known good and bad

cfc332good bad

Bisecting

7b35b 912969680d2ab1f c6d43 cfc332good bad

Bisecting

7b35b 912969680d2ab1f c6d43 cfc332good badgood

Bisecting

7b35b 912969680d2ab1f c6d43 cfc332good badgoodgood

Bisecting

7b35b 912969680d2ab1f c6d43 cfc332good badgoodgood

2ab1f is most likely good because the commit after it is

Bisecting

7b35b 912969680d2ab1f c6d43 cfc332good badgoodgood bad

Bisecting

7b35b 912969680d2ab1f c6d43 cfc332good badgoodgood badbad

Recovering lost commits

git reflog

Technically shows any action where the tip of a branch is modified

git reflog --allshows stashes, bisects, etc.

Recovery

Let’s say I reset --hard and wiped out the commit that changed my LED to pin 10Use combination of reflog and cherry-pick to get it back

Recovery

Found it! 3ecdba3

RecoveryDouble check that 3ecdba3 is really the commit we want

git diff 3ecdba3^.. 3ecdba3

Shows me the difference between the commit I wantto cherry pick and the commit prior.

git cherry-pickNow cherry pick 3ecdba3 into our working tree

Note: the sha has changed because this commit now hasa different parent than it did when it was recorded into the reflog

RecoveryCheckout the reflog again to see the cherry-pick

Interactive RebasingChanging the past one commit at a time

git rebase -i [commit]

Interactive rebase

git internalsThe plumbing and the porcelain

git internalsgit stores snapshots, not differencesStoring differences is slow and inflexible

CVS/Subversion git

git internalsgit stores snapshots, not differencesStoring differences is slow and inflexible

CVS/Subversion git

git internals

What does a commit look like?

git internals

Let’s investigate a repo

Sorry for the bad “investigation” image ;-)

Thanks!Come work with me at OpenSky!

We’re Hiring

Git: Beyond the Basics

Technology

Transcript of Git: Beyond the Basics

Introduction to Git Basics

Sys05 uso consapevole di git - beyond the basic

EECS 470 Lab 4Git Git Basics by Example Git Basics Introduction Structure For each command you need to know, we will 1. Occasionally, an aside with a Git Concept we need to describe

Git Basics Workshop Summer of Tech 2010

GIT BASICS FOR EVERYONE...Git installation Macbook: If Xcode exists, probably you already have git. Check with `git —version` `brew install git` Windows: Download windows git installer

GIT Basics

Git - the basics

The Basics of Git and GitHub

Version Control History and Git Basics

Git - Intro to the Basics of DVCS

Some Git Basics - Programming 2 · Some Git Basics A few useful details including how to use .gitignore. Applied Software Project Management. Git is a Version Control System A VCS

Git Basics: Climbing the Totem Pole

Session 2: Git Basics CS3110 Level Up!CS3110 Level Up! Session 2: Git Basics Anna Fang Git: Version control system a.k.a. allows users to collaboratively work on code A few things

Beyond Sit and Git: Transform to Professional Learning

Git the basics - Excessedgyu.excess.org/git-tutorial/2008-07-09/intro-to-git.pdf · Git the basics Ba rt T rojano wski, ba rt@jukie.net Concepts SCM comp onents SCM op erations Decentralization

Git Basics 1 Carenza

Mastering Git Basics - erlang-factory.com · Mastering Git Basics by Tom Preston-Werner Presentation ... (C5) is created Presentation

Git Basics - Georgia Institute of Technology · Git Basics Christopher Simpkins chris.simpkins@gatech.edu Chris Simpkins (Georgia Tech) CS 2340 Objects and Design CS 1331 1 / 22

Git basics, Team Workflows (Ciro Miranda)

Beyond the Basics - isis.apache.org · Table of Contents 1. Beyond the Basics ...