Upload File

getting to know git

32
Chicago, October 19 - 22, 2010 Getting to know Git Colin Harrington – Object Partners

Upload: colin-harrington

Post on 21-Jan-2015

1.533 views

Category:

Technology


1 download

Report

Tags:

DESCRIPTION

Git is known as 'the fast version control system' and has gained much popularity in the last couple years for good reason. Grails itself has moved to Git and is now hosted on github - http://github.com/grails. In this session at SpringOne2gx we spent time getting to know some of the basics of Git and exploring successful tools and workflows. We will also learn how we can utilize git and git-svn to work with grails.

TRANSCRIPT

Page 1: Getting To Know Git

Chicago, October 19 - 22, 2010

Getting to know Git

Colin Harrington – Object Partners

Page 2: Getting To Know Git

SpringOne 2GX 2010. All rights reserved. Do not distribute without permission.

whoami

Colin Harrington

Senior Consultant

@ColinHarrington

[email protected]

[email protected]

mailto:[email protected]
mailto:[email protected]
Page 3: Getting To Know Git

What is Git?

Git is a free & open source, distributed version control system designed to handle everything from small to very large projects with speed and efficiency.

Every Git clone is a full-fledged repository with complete history and full revision tracking capabilities, not dependent on network access or a central server. Branching and merging are fast and easy to do.

– http://git-scm.com/

SpringOne 2GX 2010. All rights reserved. Do not distribute without permission.

Page 4: Getting To Know Git

Why Git?

SpringOne 2GX 2010. All rights reserved. Do not distribute without permission.

Page 5: Getting To Know Git

Why Git?

http://github.com/grails/

SpringOne 2GX 2010. All rights reserved. Do not distribute without permission.

http://github.com/grails/
Page 6: Getting To Know Git

Git != SVN

SpringOne 2GX 2010. All rights reserved. Do not distribute without permission.

Page 7: Getting To Know Git

Centralized VCS

SpringOne 2GX 2010. All rights reserved. Do not distribute without permission.

Page 8: Getting To Know Git

Decentralized / Distributed VCS

SpringOne 2GX 2010. All rights reserved. Do not distribute without permission.

Page 9: Getting To Know Git

Git – SVN Crash Course

http://git-scm.com/course/svn.html

SpringOne 2GX 2010. All rights reserved. Do not distribute without permission.

Page 10: Getting To Know Git

Mind << git basics

start brand new repository:git init

clone an existing repository:git clone <git-url>

SpringOne 2GX 2010. All rights reserved. Do not distribute without permission.

Page 11: Getting To Know Git

SpringOne 2GX 2010. All rights reserved. Do not distribute without permission.

Demo

Page 12: Getting To Know Git

Mind << git basics

git init

git add .

git commit

git init

git add .

git commit

SpringOne 2GX 2010. All rights reserved. Do not distribute without permission.

Page 13: Getting To Know Git

Mind << git fundamentals

`

SpringOne 2GX 2010. All rights reserved. Do not distribute without permission.

Page 14: Getting To Know Git

Mind << git fundamentals

SpringOne 2GX 2010. All rights reserved. Do not distribute without permission.

Page 15: Getting To Know Git

Mind << git fundamentals

SHA hashes

Authorship preservation

Tree Structure!

SpringOne 2GX 2010. All rights reserved. Do not distribute without permission.

Page 16: Getting To Know Git

Mind << git fundamentals

http://book.git-scm.com/1_the_git_object_model.html

SpringOne 2GX 2010. All rights reserved. Do not distribute without permission.

Page 17: Getting To Know Git

Porcelain vs Plumbing

SpringOne 2GX 2010. All rights reserved. Do not distribute without permission.

Page 18: Getting To Know Git

Porcelain vs Plumbing

initlogrebasemergecommitaddcheckoutrevertpack

pullpush

statusbisectclonediffgreptag

branch

SpringOne 2GX 2010. All rights reserved. Do not distribute without permission.

Page 19: Getting To Know Git

Mind << branch

git branch

git branch -a

git checkout -b <branchName>

git checkout <existingBranchName>

SpringOne 2GX 2010. All rights reserved. Do not distribute without permission.

Page 20: Getting To Know Git

Mind << merge

git merge <branch>

git merge <branch> --no-commit

SpringOne 2GX 2010. All rights reserved. Do not distribute without permission.

Page 21: Getting To Know Git

Mind << clone

git clone <url>

Similar to svn checkoutClones the entire repository!

Adds a remote

SpringOne 2GX 2010. All rights reserved. Do not distribute without permission.

Page 22: Getting To Know Git

Mind << remotes

git branch -r

git branch --track <branch> <remote-branch>

git branch -r -d <remote-branch>

SpringOne 2GX 2010. All rights reserved. Do not distribute without permission.

Page 23: Getting To Know Git

Mind << working with remotes

Index

LocalRepository

RemoteRepository

Push

Pull

Files on drive

SpringOne 2GX 2010. All rights reserved. Do not distribute without permission.

Page 24: Getting To Know Git

SpringOne 2GX 2010. All rights reserved. Do not distribute without permission.

Demo

Page 25: Getting To Know Git

Mind << git-svn

clone an entire SVN repository!

git svn clone -s <url>

git svn clone -s -r 1234 <url>

… without -s, etc.

SpringOne 2GX 2010. All rights reserved. Do not distribute without permission.

Page 26: Getting To Know Git

Mind << git-svn

git svn rebase→ rebases the current branch on the remote-tracked

svn branch (trunk or branches)

git svn fetch→ fetches changes from svn

Checkout a remote branchKeep the original branches clean!!

Stash, rebase, dcommit, and do it again!SpringOne 2GX 2010. All rights reserved. Do not distribute without permission.

Page 27: Getting To Know Git

Give Back to Grails

http://grails.org/contribute

http://grails.org/Creating+Patches+From+Git

http://grails.org/GitHub+Forking+and+Pull+Requests

http://jira.codehaus.org/browse/GRAILS

http://grails.org/contribute
http://grails.org/Creating+Patches+From+Git
http://grails.org/GitHub+Forking+and+Pull+Requests
Page 28: Getting To Know Git

SpringOne 2GX 2010. All rights reserved. Do not distribute without permission.

Demo

Page 29: Getting To Know Git

Resources

http://www.sourcemage.org/Git_Guide

http://git.or.cz/course/svn.html

http://www.youtube.com/watch?v=4XpnKHJAok8

http://www.kernel.org/pub/software/scm/git/docs/user-manual.html

http://www.kernel.org/pub/software/scm/git/docs/everyday.html

http://book.git-scm.com/

http://whygitisbetterthanx.com/

http://cheat.errtheblog.com/s/git

http://progit.org/book/

http://refcardz.dzone.com/refcardz/getting-started-git

http://bit.ly/avGDTz

… many more valuable resources out there!

SpringOne 2GX 2010. All rights reserved. Do not distribute without permission.

http://www.sourcemage.org/Git_Guide
http://git.or.cz/course/svn.html
http://www.youtube.com/watch?v=4XpnKHJAok8
http://www.kernel.org/pub/software/scm/git/docs/user-manual.html
http://www.kernel.org/pub/software/scm/git/docs/everyday.html
http://book.git-scm.com/
http://whygitisbetterthanx.com/
http://cheat.errtheblog.com/s/git
http://progit.org/book/
http://refcardz.dzone.com/refcardz/getting-started-git
Page 30: Getting To Know Git

SpringOne 2GX 2010. All rights reserved. Do not distribute without permission.

Q&A

Page 31: Getting To Know Git

SpringOne 2GX 2010. All rights reserved. Do not distribute without permission.

Thank you!

Page 32: Getting To Know Git

Credits

Git logo :: by azizash :: http://azizash.deviantart.com/art/GIT-Logo-95183398

Grails logo :: http://grails.org/Brand

Perl logo :: Criado por O'Reilly :: http://commons.wikimedia.org/wiki/File:Perl.jpg

VLC logo :: illustration (and iteration) by Richard C. G. Øiestad. GNU GPL by Video LAN

Rails logo :: KSEltar :: http://commons.wikimedia.org/wiki/File:Ruby_on_Rails_logo.svg

jQuery logo :: http://commons.wikimedia.org/wiki/File:Logo_jquery_215x53.gif

Linux logo :: gg3po (kde-look.org source) :: http://commons.wikimedia.org/wiki/File:NewTux.svg

Eclipse logo :: http://www.eclipse.org/artwork/

Android logo :: Google and Android's developpers :: http://commons.wikimedia.org/wiki/File:Android_robot.svg

SpringOne 2GX 2010. All rights reserved. Do not distribute without permission.


Got Git? Getting More Out of Your GitHub Repositories Git- Getting More...Got Git? Getting More Out of Your GitHub Repositories . SCCS Source Code Control System . SCCS: Before Git

Git - Getting started with using versioning system

CMSC433 Solving Project 0 Getting started with BitBucket, Git and Eclipse

Getting Started with Git - University of Waterloocs349/s16/slides/1.3-git.pdf · Getting Started with Git Introduction to version control Benefits of using Git Basic commands Workflow

Getting to know your feet Getting to Know Your Feet

COMMON Europe Workshop: Orion, Git, and Python! - …schd.ws/hosted_files/commoneuropecongress2017/57/GitOrion.pdf · COMMON Europe Workshop: Orion, Git, and Python! Jesse ... //git-scm.com/book/en/v2/Getting-Started-Git-Basics

Getting To Know Enyo

Know the science behind workflows using Git GitHub

Getting Started with Git using Team Foundation …download.microsoft.com/download/6/2/B/62B60ECE-B… · Web viewHands-On Lab Getting Started with Git using Team Foundation Server

PDPM: Getting to Know You - SimpleLTC · PDPM: Getting to Know You Why Understanding Your Resident is the First Step Susan Krall, PT, RAC-CT “Getting to know you Getting to know

Getting Started on distributed version control with git

GETTING TO KNOW YOU

Getting Git - Amazon S3s3.amazonaws.com/chacon/git-talk.pdf · What is Git? How Does Git Work? How Do I Use Git? 2m This Slide 3m 20m 12m 4m How Do I Deploy with Git? 2m Where Can

Getting some Git

Git Workshop : Getting Started

Git-it Getting started about GitHub

Git 더하기 GitHub(Git클라이언트 활용) / Getting started with git+github

Getting Into Git

Getting Started with Git: A Primer for SVN and TFS Users

Six3 Getting Git

Getting Git

Constellations on i: Orion, Git, and RPG - Schedschd.ws/hosted_files/commons17/f8/GitORion.pdf · Constellations on i: Orion, Git, and RPG ... //git-scm.com/book/en/v2/Getting-Started-Git-Basics

Getting Started with Git

GETTING STARTED WITH - Red Hatpeople.redhat.com/.../june2017/gettingstartedwithgit.pdf · 2017. 6. 15. · Getting started with GIT GIT key concepts 2/2 Branch All commit in git live

Knowledge is Power: Getting out of trouble by understanding Git

Curriculum Data Science Bootcamp · o Operating Systems and Linux ... o What is Version Control and Git? o Installing Git o Getting Started with Git o Git Tips o Undoing Changes

Getting Git with Atlassian Stash - Choose Your Own Adventure - WEBINAR

Getting Git Right

Getting to Know Bristol.ppt

Getting intimate with Git

Getting to Know Google+

Get Ur Git On: Introduction and getting started with Github

Chapter 1: Getting started with Git - · PDF fileThe Git Credential Manaaer for Windows provides secure Git credential storage for Windows, most notably multi-factor authentication

Know the Science behind WorkFlows using Git & GitHhub

GETTING TO KNOW GIT: PART II - Xojocdn.xojo.com/WebinarExamples/Xojo Webinar - Getting To Know Git... · • GitFlow is a popular branching model