• Home

  • Documents

  • Git: Part 1 Overview & Object Model These slides were largely cut-and-pasted from tutorial/,...
42
Git: Part 1 Overview & Object Model These slides were largely cut-and-pasted from http://excess.org/article/2008/07/ogre-git-tuto rial/ , with some additions from other sources. I have deleted a lot from the cited tutorial, and recommend that you listen to the entire tutorial on line, if you can.

Git: Part 1 Overview & Object Model These slides were largely cut-and-pasted from tutorial/, with some additions

Tags:

Embed Size (px)

Citation preview

Page 1: Git: Part 1 Overview & Object Model These slides were largely cut-and-pasted from tutorial/, with some additions

Git: Part 1Overview & Object Model

These slides were largely cut-and-pasted from http://excess.org/article/2008/07/ogre-git-tutorial/ ,

with some additions from other sources. I have deleted a lot from the cited tutorial, and

recommend that you listen to the entire tutorial on line, if you can.

http://excess.org/article/2008/07/ogre-git-tutorial/
Page 2: Git: Part 1 Overview & Object Model These slides were largely cut-and-pasted from tutorial/, with some additions

Who needs Git?

http://www.geekherocomic.com/2009/01/26/who-needs-git/

http://www.geekherocomic.com/2009/01/26/who-needs-git/
Page 3: Git: Part 1 Overview & Object Model These slides were largely cut-and-pasted from tutorial/, with some additions

Topics

• What is Git?• SCM concepts used in Git• Git object model• Representation of Git objects as files• References

Page 4: Git: Part 1 Overview & Object Model These slides were largely cut-and-pasted from tutorial/, with some additions

Git

• A collection of tools developed by Linux kernel group for SCM– Now used by several other groups, and

apparently growing in popularity

• Actually implements a replicated versioned file system

• Can be used to implement a variety of software configuration management models and workflows

Page 5: Git: Part 1 Overview & Object Model These slides were largely cut-and-pasted from tutorial/, with some additions

Git Flavor

• A collection of many tools• Evolved from scripts• Suited to a C programmer’s mentality• Everything is exposed and accessible• Very flexible– You can do anything the model permits– Including shooting yourself in the foot

• Need to understand the underlying model

Page 6: Git: Part 1 Overview & Object Model These slides were largely cut-and-pasted from tutorial/, with some additions

Git has a lot of commands

• Learn a core subset of them• And one of the GUI tools (e.g., gitk)• Then learn the rest as you need them

Page 7: Git: Part 1 Overview & Object Model These slides were largely cut-and-pasted from tutorial/, with some additions

Groups of Git commands

• Setup and branch management– init, checkout, branch

• Modify– add, delete, rename, commit

• Get information– status, diff, log

• Create reference points– tag, branch

Page 8: Git: Part 1 Overview & Object Model These slides were largely cut-and-pasted from tutorial/, with some additions

Source code

contains– Directories– Files

is the substance of a software configuration

http://edgyu.excess.org/git-tutorial/2008-07-09/intro-to-git.pdf

http://edgyu.excess.org/git-tutorial/2008-07-09/intro-to-git.pdf
Page 9: Git: Part 1 Overview & Object Model These slides were largely cut-and-pasted from tutorial/, with some additions

Repository

Contains– files– commits

records history of changes to configurationhttp://edgyu.excess.org/git-tutorial/2008-07-09/intro-to-git.pdf

http://edgyu.excess.org/git-tutorial/2008-07-09/intro-to-git.pdf
Page 10: Git: Part 1 Overview & Object Model These slides were largely cut-and-pasted from tutorial/, with some additions

Repository

Contains– files– commits– ancestry relationships

http://edgyu.excess.org/git-tutorial/2008-07-09/intro-to-git.pdf

http://edgyu.excess.org/git-tutorial/2008-07-09/intro-to-git.pdf
Page 11: Git: Part 1 Overview & Object Model These slides were largely cut-and-pasted from tutorial/, with some additions

Ancestry relationships

form a directed acyclic graph (DAG)

http://edgyu.excess.org/git-tutorial/2008-07-09/intro-to-git.pdf

http://edgyu.excess.org/git-tutorial/2008-07-09/intro-to-git.pdf
Page 12: Git: Part 1 Overview & Object Model These slides were largely cut-and-pasted from tutorial/, with some additions

Ancestry graph features

Tags– identify versions of interest– including “releases”

http://edgyu.excess.org/git-tutorial/2008-07-09/intro-to-git.pdf

http://edgyu.excess.org/git-tutorial/2008-07-09/intro-to-git.pdf
Page 13: Git: Part 1 Overview & Object Model These slides were largely cut-and-pasted from tutorial/, with some additions

Ancestry graph features

HEAD– is current checkout– usually points to a branch

http://edgyu.excess.org/git-tutorial/2008-07-09/intro-to-git.pdf

http://edgyu.excess.org/git-tutorial/2008-07-09/intro-to-git.pdf
Page 14: Git: Part 1 Overview & Object Model These slides were largely cut-and-pasted from tutorial/, with some additions

Head may point to any commit

In this case it issaid to be detached.

http://edgyu.excess.org/git-tutorial/2008-07-09/intro-to-git.pdf

http://edgyu.excess.org/git-tutorial/2008-07-09/intro-to-git.pdf
Page 15: Git: Part 1 Overview & Object Model These slides were largely cut-and-pasted from tutorial/, with some additions

Git components

Index– “staging area”– what is to be

committed

http://edgyu.excess.org/git-tutorial/2008-07-09/intro-to-git.pdf

http://edgyu.excess.org/git-tutorial/2008-07-09/intro-to-git.pdf
Page 16: Git: Part 1 Overview & Object Model These slides were largely cut-and-pasted from tutorial/, with some additions

History

A database, stored in directory “.git”.

http://edgyu.excess.org/git-tutorial/2008-07-09/intro-to-git.pdf

http://edgyu.excess.org/git-tutorial/2008-07-09/intro-to-git.pdf
Page 17: Git: Part 1 Overview & Object Model These slides were largely cut-and-pasted from tutorial/, with some additions

Staging area

Also stored in directory “.git”.

http://edgyu.excess.org/git-tutorial/2008-07-09/intro-to-git.pdf

http://edgyu.excess.org/git-tutorial/2008-07-09/intro-to-git.pdf
Page 18: Git: Part 1 Overview & Object Model These slides were largely cut-and-pasted from tutorial/, with some additions

Files you edit

Stored in the directory containing directory “.git”.

http://edgyu.excess.org/git-tutorial/2008-07-09/intro-to-git.pdf

http://edgyu.excess.org/git-tutorial/2008-07-09/intro-to-git.pdf
Page 19: Git: Part 1 Overview & Object Model These slides were largely cut-and-pasted from tutorial/, with some additions

Staging

add

http://edgyu.excess.org/git-tutorial/2008-07-09/intro-to-git.pdf

http://edgyu.excess.org/git-tutorial/2008-07-09/intro-to-git.pdf
Page 20: Git: Part 1 Overview & Object Model These slides were largely cut-and-pasted from tutorial/, with some additions

Committing

commit

http://edgyu.excess.org/git-tutorial/2008-07-09/intro-to-git.pdf

http://edgyu.excess.org/git-tutorial/2008-07-09/intro-to-git.pdf
Page 21: Git: Part 1 Overview & Object Model These slides were largely cut-and-pasted from tutorial/, with some additions

Checking out

checkout checkout

http://edgyu.excess.org/git-tutorial/2008-07-09/intro-to-git.pdf

http://edgyu.excess.org/git-tutorial/2008-07-09/intro-to-git.pdf
Page 22: Git: Part 1 Overview & Object Model These slides were largely cut-and-pasted from tutorial/, with some additions

Local Operations

add (stage) files

Working directory

Repository(.git directory)

Index (staging

area)

checkout the project

commit

Page 23: Git: Part 1 Overview & Object Model These slides were largely cut-and-pasted from tutorial/, with some additions

Object types

• Blobs• Trees• Commits• Tags

Page 24: Git: Part 1 Overview & Object Model These slides were largely cut-and-pasted from tutorial/, with some additions

Git Object Model

http://book.git-scm.com/assets/images/figure/objects-example.png

http://book.git-scm.com/assets/images/figure/objects-example.png
Page 25: Git: Part 1 Overview & Object Model These slides were largely cut-and-pasted from tutorial/, with some additions

As UML class diagram

http://utsl.gen.nz/talks/git-svn/git-model.png

http://utsl.gen.nz/talks/git-svn/git-model.png
Page 26: Git: Part 1 Overview & Object Model These slides were largely cut-and-pasted from tutorial/, with some additions

Repository

Page 27: Git: Part 1 Overview & Object Model These slides were largely cut-and-pasted from tutorial/, with some additions

.git/objects|-- 23| ‘-- d4bd826aba9e29aaace9411cc175b784edc399|-- 76| ‘-- 49f82d40a98b1ba59057798e47aab2a99a11d3|-- c4| ‘-- aaefaa8a48ad4ad379dc1002b78f1a3e4ceabc|-- e7| ‘-- 4be61128eef713459ca4e32398d689fe80864e|-- info| ‘-- packs‘-- pack |-- pack-b7b026b1a0b0f193db9dea0b0d7367d25d3a68cc.idx ‘-- pack-b7b026b1a0b0f193db9dea0b0d7367d25d3a68cc.pack

loose

Page 28: Git: Part 1 Overview & Object Model These slides were largely cut-and-pasted from tutorial/, with some additions

Some other repository files

• .git/config• .git/description – used by gitweb• .git/info/exclude – files to ignore• ...

Page 29: Git: Part 1 Overview & Object Model These slides were largely cut-and-pasted from tutorial/, with some additions

Repository object naming convention

“content addressable” (hashed)

http://edgyu.excess.org/git-tutorial/2008-07-09/intro-to-git.pdf

http://edgyu.excess.org/git-tutorial/2008-07-09/intro-to-git.pdf
Page 30: Git: Part 1 Overview & Object Model These slides were largely cut-and-pasted from tutorial/, with some additions

Data values determine hash

http://edgyu.excess.org/git-tutorial/2008-07-09/intro-to-git.pdf

http://edgyu.excess.org/git-tutorial/2008-07-09/intro-to-git.pdf
Page 31: Git: Part 1 Overview & Object Model These slides were largely cut-and-pasted from tutorial/, with some additions

Hash value is filename

http://edgyu.excess.org/git-tutorial/2008-07-09/intro-to-git.pdf

http://edgyu.excess.org/git-tutorial/2008-07-09/intro-to-git.pdf
Page 32: Git: Part 1 Overview & Object Model These slides were largely cut-and-pasted from tutorial/, with some additions

File contains data

http://edgyu.excess.org/git-tutorial/2008-07-09/intro-to-git.pdf

http://edgyu.excess.org/git-tutorial/2008-07-09/intro-to-git.pdf
Page 33: Git: Part 1 Overview & Object Model These slides were largely cut-and-pasted from tutorial/, with some additions

Blobs

http://edgyu.excess.org/git-tutorial/2008-07-09/intro-to-git.pdf

http://edgyu.excess.org/git-tutorial/2008-07-09/intro-to-git.pdf
Page 34: Git: Part 1 Overview & Object Model These slides were largely cut-and-pasted from tutorial/, with some additions

Trees

http://edgyu.excess.org/git-tutorial/2008-07-09/intro-to-git.pdf

http://edgyu.excess.org/git-tutorial/2008-07-09/intro-to-git.pdf
Page 35: Git: Part 1 Overview & Object Model These slides were largely cut-and-pasted from tutorial/, with some additions

Trees

http://edgyu.excess.org/git-tutorial/2008-07-09/intro-to-git.pdf

http://edgyu.excess.org/git-tutorial/2008-07-09/intro-to-git.pdf
Page 36: Git: Part 1 Overview & Object Model These slides were largely cut-and-pasted from tutorial/, with some additions

Trees

http://edgyu.excess.org/git-tutorial/2008-07-09/intro-to-git.pdf

http://edgyu.excess.org/git-tutorial/2008-07-09/intro-to-git.pdf
Page 37: Git: Part 1 Overview & Object Model These slides were largely cut-and-pasted from tutorial/, with some additions

Commits

http://edgyu.excess.org/git-tutorial/2008-07-09/intro-to-git.pdf

http://edgyu.excess.org/git-tutorial/2008-07-09/intro-to-git.pdf
Page 38: Git: Part 1 Overview & Object Model These slides were largely cut-and-pasted from tutorial/, with some additions

Commits

http://edgyu.excess.org/git-tutorial/2008-07-09/intro-to-git.pdf

http://edgyu.excess.org/git-tutorial/2008-07-09/intro-to-git.pdf
Page 39: Git: Part 1 Overview & Object Model These slides were largely cut-and-pasted from tutorial/, with some additions

Commits

http://edgyu.excess.org/git-tutorial/2008-07-09/intro-to-git.pdf

http://edgyu.excess.org/git-tutorial/2008-07-09/intro-to-git.pdf
Page 40: Git: Part 1 Overview & Object Model These slides were largely cut-and-pasted from tutorial/, with some additions

Commits

http://edgyu.excess.org/git-tutorial/2008-07-09/intro-to-git.pdf

http://edgyu.excess.org/git-tutorial/2008-07-09/intro-to-git.pdf
Page 41: Git: Part 1 Overview & Object Model These slides were largely cut-and-pasted from tutorial/, with some additions

Objects are immutable

http://edgyu.excess.org/git-tutorial/2008-07-09/intro-to-git.pdf

http://edgyu.excess.org/git-tutorial/2008-07-09/intro-to-git.pdf
Page 42: Git: Part 1 Overview & Object Model These slides were largely cut-and-pasted from tutorial/, with some additions

References

• http://book.git-scm.com/index.html• http://excess.org/article/2008/07/ogre-git-tutorial/• http://www-cs-students.stanford.edu/~blynn/gitmagi

c/

• http://progit.org/book/• http://www.geekherocomic.com/2009/01/26/who-nee

ds-git/

http://book.git-scm.com/index.html
http://excess.org/article/2008/07/ogre-git-tutorial/
http://www-cs-students.stanford.edu/~blynn/gitmagic/
http://www-cs-students.stanford.edu/~blynn/gitmagic/
http://www-cs-students.stanford.edu/~blynn/gitmagic/
http://progit.org/book/
http://progit.org/book/
http://progit.org/book/
http://www.geekherocomic.com/2009/01/26/who-needs-git/
http://www.geekherocomic.com/2009/01/26/who-needs-git/

Pasted image-533

Pasted image-533

Documents
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

A brief introduction to git & GitHubkbroman/presentations/Git...git clone [email protected]:username/repo Change things locally, git add, git commit Push your changes to your GitHub repository

Documents
Vinyle pasted & flex stitched auto branding

Vinyle pasted & flex stitched auto branding

Services
Git J Club Dm Git

Git J Club Dm Git

Health & Medicine
Git and git flow

Git and git flow

Technology
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

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

Documents
Git avanzado - Mario González, formador y desarrollador web · 2019-10-01 · git fetch + git rebase = git pull --rebase Subir tags: git push --tags Git avanzado. Repositorios remotos

Git avanzado - Mario González, formador y desarrollador web · 2019-10-01 · git fetch + git rebase = git pull --rebase Subir tags: git push --tags Git avanzado. Repositorios remotos

Documents
Git & e git beginner workshop

Git & e git beginner workshop

Technology
Git Started With Git

Git Started With Git

Technology
PetaLinux Tools Documentation - Xilinx · git git 1.8.3 git 1.7.1 git 1.7.1 git 1.8.3 git 1.8.3 git 1.7.1 or above ... If yo u wish to keep the license for your records, ... • Clean

PetaLinux Tools Documentation - Xilinx · git git 1.8.3 git 1.7.1 git 1.7.1 git 1.8.3 git 1.8.3 git 1.7.1 or above ... If yo u wish to keep the license for your records, ... • Clean

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

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

Documents
Pasted image-2599

Pasted image-2599

Documents
Johan Herland €¦ · The Git Parable Git - simple & powerful git init git add … git commit … git branch … git checkout … git tag … git diff …

Johan Herland €¦ · The Git Parable Git - simple & powerful git init git add … git commit … git branch … git checkout … git tag … git diff …

Documents
IFRA Transparency List - copy pasted March 2020

IFRA Transparency List - copy pasted March 2020

Documents
Git, smart git & gitflow

Git, smart git & gitflow

Internet
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

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

Documents
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

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

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

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

Documents
Pasted image-2621

Pasted image-2621

Documents
Pasted image-2624

Pasted image-2624

Documents
Pasted image-2207

Pasted image-2207

Documents
Pasted image-2651

Pasted image-2651

Documents
CS140 Project 1: Threads - Stanford University · git basics git add git commit git pull git push git merge git branch * Lots of git tutorials and help available online

CS140 Project 1: Threads - Stanford University · git basics git add git commit git pull git push git merge git branch * Lots of git tutorials and help available online

Documents
ALaboratoryIntroductionto git and GitHubnewton.cx/~peter/files/git-lab-handout.pdf · git status, git checkout 7 Topic 3: git status, git checkout Fundamentally, Now,insomecircumstancesHEAD

ALaboratoryIntroductionto git and GitHubnewton.cx/~peter/files/git-lab-handout.pdf · git status, git checkout 7 Topic 3: git status, git checkout Fundamentally, Now,insomecircumstancesHEAD

Documents
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,

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,

Documents
Pasted image-2596

Pasted image-2596

Documents
Pasted image-2149

Pasted image-2149

Documents
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

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

Documents
Pasted image-365

Pasted image-365

Documents
Version Control with Git - lucydot.github.io · Configuring Git • git config Creating a repository • git init, git status Tracking the changes to your files • git add, git commit,

Version Control with Git - lucydot.github.io · Configuring Git • git config Creating a repository • git init, git status Tracking the changes to your files • git add, git commit,

Documents