Git, an Illustrated Primer

Daniel Cousineau // follow me : @dcousineau or http://dcousineau.com

GIT: An Illustrated Primer

http://mojolive.com/profile/dcousineau

History

BitKeeper No Longer Free To Use

Linux Kernel RequiresDistributed

Performant

SVN and CVS... Not So Much

“CVS is what we should NOT do...”

GITthus,

gItting started

+Linux

$> sudo apt-get install git$> sudo yum install git$> echo "Seriously?"

http://git-scm.com

$> ruby <(curl -fsSkL raw.github.com/mxcl/homebrew/go)$> brew install git$> say "Win!"

+Windows

http://windows.github.com

+Gitting STarted

+My First Repo

+Stage New Files

+Commit Staging

+staging?

working directory

repository

+staging?

working directory

repository

“staging”

+staging?

working directory

repository

modify

+staging?

working directory

repository

git add

+staging?

working directory

repository git commit

+Directories

+Modify

+Branch!

+Back to Master

+Merge!

+stashing

+Popping

branching

MASTER

DEVELOP

create new branch

MASTER

DEVELOP

Checkout new branch

MASTER

DEVELOP

commit to develop

commit to master HEAD

MASTER

DEVELOP

MASTER

DEVELOP

merge Develop

Remote

SVN GIT

+Create a Project

+Doing as I am told

+did as I was told

+Push Again!

+Fetching & Merging

+Pulling

+Two Authors Two Pushes

+AFtermath

+Aftermath

+AFtermath

+forking

+pull requests

+MAke Changes IN A NEW BRANCH

+Push Changes

+See Our New Branch

+Create Pull Request

+Oh Look, Our Pull Request

+Oh Look Our Pull Request

+Oh Look, It’s Merged In!

+Remotes

+Adding Another Remote

+create and sync new branches

+Delete local and remote branches

+Pull From One, Push To Another

GIT FLow

Subversion and GIT

+et voilà

$> git svn clone -s -r 1000:HEAD https://url/to/repo ./wkngcpy$> git svn show-ignore > .gitignore

+Workflow

Normal GIT Workflow

$> git svn dcommit --dry-run$> git svn dcommit$> git svn rebase

+With some caveats

anything that has been dcommit’d

is set in stone! do. not. touch.

git branches wellsvn... not so much

+Local Branching

$> git merge --squash branch

git merge --squash localbrn

MASTER

localbrn

git merge --squash localbrn

MASTER

SVN is TERRIBLE at merges

git-svn will do it if you don’tand when it fails, it does so spectacularly

you’ll just litter your commit history

+tracking svn branches

$> git checkout -t remotes/branchname

+creating remote branches

$> git svn branch -m “Creating new branch” branchname$> git checkout -t remotes/branchname

+personal opinion

except for release taggingand a develop branch

don’t bother with remote branchingjust stick to local and squashes

use git svn locally

push for team

adoption

procure git server

full clone push to new

git server

use git svn locally

push for team

adoption

procure git server

full clone push to new

git server

Advanced Usage

+reset my local changes

$> git checkout -- .

tell git “no more options!”

+Replay Last commit

$> git reset --mixed REF

+Gitting Ready

+Results

+Undo Last commit

$> git reset --hard HEAD^

HEAD^ means commit prior to HEAD. HEAD^2 is 2

commits prior, etc etc.

+“Oops i forgot to branch”

$> git branch newbranchname$> git reset --hard SHA

commit immediately before the intended first commit

of our new branch

+“Oops I accidentally the commit message”

$> git rebase --interactive SHA

commit immediately preceding the commit in

question

+Lay of the land

+Making decisions

+Reach 88MPH

+Fun with Paradoxes

+Fruits of our labor

+“Oops I committed the private key”

$> git filter-branch --index-filter \ 'git rm --cached --ignore-unmatch secret.key' \ --prune-empty --tag-name-filter cat -- --all

ಠ_ಠ

+Terrible Mistake

+gone now, here yesterday

+VooDoo Magic

+Results

+Cleanup The Mess

+Look Ma, No secret.key!

THANKS. FOR YOUR ATTENTION

+further resources

http://git-scm.com/book

FREE!Attribution-NonCommercial-ShareAlike 3.0 Unported

https://help.github.com

Git, an Illustrated Primer

Technology

THE PRIMER - Yesterday's Classics · reading-literature the primer by harriette taylor treadwell and margaret free illustrated by frederick richardson yesterday’s classics

Git Going w/ Git

2012 GIT English - Ape Panthiya GIT English... · 2012 GIT English @ apepanthiya.lk Subject: G.C.E A/L GIT Past Papers Keywords: git, al git, git papers, git past papers, git exam,

Git in pills : git stash

2013 GIT Sinhala @ apepanthiya GIT Sinhala... · 2013 GIT Sinhala @ apepanthiya.lk Subject: G.C.E A/L GIT Past Papers Keywords: git, al git, git papers, git past papers, git exam,

Git Started With Git

A Brief Git Primer for CS 350 - University of Waterloocs350/common/... · Git What is this Git you speak of? A speci c implementation of a version control system. Why should I use

Git & Git Workflows

new repository – clone · Initialized empty Git repository abaj ric@nb01 — Terminal git-demo . git in /home/abaj ric/git-demo.git/ Terminal abajric@nb01 -/git-demo-local S git

Everything you need to know about Google's new Material Design: An Illustrated Primer

A brief introduction to git & GitHubkbroman/presentations/Git...git clone git@github.com:username/repo Change things locally, git add, git commit Push your changes to your GitHub repository

The Diamond Age: A Young Rebel's Illustrated Primer

2012 GIT Sinhala @ apepanthiya GIT Sinhala @ apepanthiya.lk.pdfTitle: 2012 GIT Sinhala @ apepanthiya.lk Subject: G.C.E A/L GIT Past Papers Keywords: git, al git, git papers, git past

Manual Git y Git Hub

Git LFS - acailly.github.io · $ git config --list [...] filter.lfs.clean=git-lfs clean -- %f filter.lfs.smudge=git-lfs smudge -- %f filter.lfs.process=git-lfs filter-process filter.lfs.required=true

YYj t Y GIT) GIT)...(k)GIT) (jJlJY) HP-K IN) Sam le Book GIT) * \YYj t Y GIT) GIT) Created Date 11/12/2018 3:39:52 PM

A Young Lady's Illustrated Primer to Architecture and Technical Decision-Making - Charity Majors, Honeycomb - DevOpsDays Tel Aviv 2016

A Brief Git Primer for CS 350cs350/common/gitprimer/gitprimer_… · Welcome to the CS 350 Git Primer tutorial! What is version control? A way to track the history of a le. Allows

Git Best Practices - MariaDB.org...$ git push Write a good commit message! Regular git workflow $ git checkout bb-10.2-bug $ # Code, build, test... $ git add . $ git commit $ git push

PowerPoint Presentation€¦ · $ git init $ git add $ git status $ git commit $ git push $ git pull $ git clone • • • • • • • • $ sudo apt-get install