intro to git

ConceitosRepositorioUsando GIT

Git o basico

Marcello Henrique, [email protected]

Brasil/Goias - UFG

23 de Outubro de 2008

Marcello Henrique, [email protected] Git o basico 1 / 84

mailto:[email protected]



1 ConceitosSource Control ManagerDecentralizacaoHistoria

2 RepositorioEstruturaObjetos

3 Usando GITComandosBranchingRemotes




Source Control ManagerDecentralizacaoHistoria

Conceitos

Gerenciamento de Codigo Fonte

Controle nas mudancas dos arquivosRepositorio / base de dados das mudancasDiretorio de trabalho / estado atual

Modelo Centralizado

Servidor: simples base de dadosCliente: diretorio de trabalho & estado

Modelo Descentralizado

Qualquer um pode ser o servidorRepositorio acoplado ao diretorio de trabalhoHistorico completoTrabalho desconectado





SCM componentes

Arvore de trabalho

diretorios

arquivos





SCM componentes

Repositorio de conteudo

arquivos

a.cv1





SCM componentes


arquivos

commits

a.cv1

b.cv9

metadata





SCM componentes


arquivos

commits

ancentrais

A

B C

E

tim

e

D





SCM componentes

Directed Acyclic Graph “DAG”

A

B C

D

EG

F

H





SCM componentes

Referencias

tags

A v1.4.4

B C

D

E

v1.5.0

G

F

H





SCM componentes

Referencias

tags

branches

A v1.4.4

B C

D

E

v1.5.0

G

F

testing

release

topicA

H





SCM componentes

HEAD

atual checkout

pontos para branch

A v1.4.4

B C

D

E

v1.5.0

G

F

testing

release

topicA

H

HEAD





SCM componentes

HEAD

atual checkout

pontos para branch

muitas vezes solto

A v1.4.4

B C

D

E

v1.5.0

G

F

testing

release

topicA

H

HEAD





SCM componentes

Indice

“staging area”

O que esta para sercomitado

A v1.4.4

B C

D

E

v1.5.0

G

F

testing

release

topicA

H

index

HEAD





SCM operacoes I

Inicializacao

init

checkout

branch

Modificacao

add, delete, rename

commit

Informacao

status

diff

log





SCM operacoes II

Referencias

tag

branch





SCM Centralizado

A v1.4.4

B C

D

E

v1.5.0

G

F

testing

release

topicA

H

diff

log

update

checkout

commit

operacoes requerem servidor

ponto de falha, funilamento





SCM Decentralizado

pull

pushA v1.4.4

B C

D

E

v1.5.0

G

F

testing

release

topicA

H

clone

A v1.4.4

B C

D

E

v1.5.0

G

F

testing

release

topicA

H

A v1.4.4

B C

D

E

v1.5.0

G

F

testing

release

topicA

H

pull

push

clo

ne

pull

pushclo

ne

qualquer um pode ser o servidor





Operacoes SCM

Decentralizado

clone

pull, fetch

push





Decentralizacao

upstream

Repositorio publico





Decentralizacao

upstream

local

Fazendo um clone local





Decentralizacao

upstream

pristine

topic Atopic B

Clonar na rede local e mais leve





Decentralizacao

upstream

pristine

topic Atopic B

Empurando mudancas entre repositorios





Decentralizacao

upstream web server

pristine

topic Atopic B

Enviando mudancas para servidores publicos





Decentralizacao

upstream web server

pristine

topic Atopic B

another

Compartilhando mudancas com redes confiaveis





Decentralizacao pode ser bom?

Micro commits nao intrusivos

Operacao de destacar

Nao ha pontos simples de falhas

Backups sao banais





Historia do GIT

2002Linus usa BitKeeper para versionar o LinuxBK e o melhorDesenvolvimento do Linux escala melhor

April 6, 2005Vence a licenca do BitMoverLinus cria seu proprio SCM, “o GIT”

April 18, 2005GIT pode fundir codigos, “merge”

June 16, 2005GIT e oficialmente usado para versionar o codigo doLinux

Feb 14, 2007GIT 1.5.0 e lancado, focando usabilidade





GIT gets better

And then realize that nothing is perfect. Git is just

*closer* to perfect than any other SCM out there.

−−Linus




EstruturaObjetos

Estrutura

A v1.4.4

B C

D

E

v1.5.0

G

F

testing

release

topicA

H

HEAD

repository

O historico




EstruturaObjetos

Estrutura

A v1.4.4

B C

D

E

v1.5.0

G

F

testing

release

topicA

H

HEAD

repository index100644 20b024 0 bar100644 1d52a6 0 baz100644 20b024 0 sub/fiz100644 43dbe0 0 sub/foo

ındices




EstruturaObjetos

Estrutura

A v1.4.4

B C

D

E

v1.5.0

G

F

testing

release

topicA

H

HEAD

repository index work tree100644 20b024 0 bar100644 1d52a6 0 baz100644 20b024 0 sub/fiz100644 43dbe0 0 sub/foo

.|−− bar|−− baz‘−− sub |−− fiz ‘−− foo

arquivos editaveis




EstruturaObjetos

Estrutura

A v1.4.4

B C

D

E

v1.5.0

G

F

testing

release

topicA

H

HEAD



“staging”: add, remove, rename




EstruturaObjetos

Estrutura

A v1.4.4

B C

D

E

v1.5.0

G

F

testing

release

topicA

H

HEAD



“committing”: commit




EstruturaObjetos

Estrutura

A v1.4.4

B C

D

E

v1.5.0

G

F

testing

release

topicA

H

HEAD



“reading tree”: checkout, read-tree, reset




EstruturaObjetos

Estrutura

A v1.4.4

B C

D

E

v1.5.0

G

F

testing

release

topicA

H

HEAD



“checking out”: checkout, checkout-index, reset




EstruturaObjetos

O repositorio

.git/config

Configuracao do repositorio

.git/description

Descricao do repositorioMuito usado pelo gitweb

.git/info/exclude

Padroes para ignorar arquivos




EstruturaObjetos

Objetos

.git/objects

|-- 23


|-- 76

| ‘-- 49f82d40a98b1ba59057798e47aab2a99a11d3

|-- c4


|-- e7

| ‘-- 4be61128eef713459ca4e32398d689fe80864e

|-- info

| ‘-- packs

‘-- pack



“Objetos perdidos”




EstruturaObjetos

Objetos

.git/objects

|-- 23


|-- 76

| ‘-- 49f82d40a98b1ba59057798e47aab2a99a11d3

|-- c4


|-- e7

| ‘-- 4be61128eef713459ca4e32398d689fe80864e

|-- info

| ‘-- packs

‘-- pack



“pack arquivo”




EstruturaObjetos

Objetos

Conteudo enderecavel

type size

data




EstruturaObjetos

Objetos


type size

data

SH

A1

52a0ff44aba8599f43a5d821c421af316cb7305




EstruturaObjetos

Objetos


type size

data

52a0ff44aba8599f43a5d821c421af316cb7305




EstruturaObjetos

Objetos

Conteudo enderecavel type size

data

52a0ff44aba8599f43a5d821c421af316cb73051




EstruturaObjetos

Objetos

4 Tipos

Blobs

"blob" size

file data




EstruturaObjetos

Objetos

4 Tipos

Blobs

Trees"tree" size

040000 tree 205f6b... somedir

100644 blob 9daeaf... somefile

"tree" size

040000 blob 257cc5... other




EstruturaObjetos

Objetos

4 Tipos

Blobs

Trees"tree" size



"tree" size


"blob" size

file data




EstruturaObjetos

Objetos

4 Tipos

Blobs

Trees"tree" size



"tree" size


"blob" size

file data

"blob" size

file data




EstruturaObjetos

Objetos

4 Tipos

Blobs

Trees

Commits"commit" size

tree cad6ae...

parent 6f0104...

author Someone <address>

comitter Another <address>

commit message

"tree" size


"blob" size

file data

"blob" size

"tree" size






EstruturaObjetos

Objetos

4 Tipos

Blobs

Trees


tree cad6ae...

parent 6f0104...



commit message

"tree" size


"blob" size

file data

"blob" size

file data

"tree" size



"commit" size

tree cad6ae...

parent 6f0104...



commit message

"tree" size


"blob" size

file data

"blob" size

file data

"tree" size






EstruturaObjetos

Objetos

4 Tipos

Blobs

Trees


tree cad6ae...

parent 6f0104...



commit message




EstruturaObjetos

Objetos

4 Tipos

Blobs

Trees

Commits

Tags

"tag" size

object cad6ae...

type commit

tag tag−name

tagger Who <address> + date

tag message

"commit" size

tree cad6ae...

parent 6f0104...



commit message

"tree" size


"blob" size

file data

"blob" size

file data

"tree" size



"commit" size

tree cad6ae...

parent 6f0104...



commit message

"tree" size


"blob" size

file data

"blob" size

file data

"tree" size






EstruturaObjetos

Objetos

Imutavel

type size

data




EstruturaObjetos

Objetos

Imutavel

type size

data

type size

data’




EstruturaObjetos

Objetos

Imutavel

type size

data

type size

data’

SH

A1

8a9fd66b8bb939638564ebfdecc23b5d58070fc8




ComandosBranchingRemotes

ComandosSintaxe

$ git <options> <command> <options>





add fast-export merge-one-file revert

am fast-import merge-resolve rm

annotate fetch merge-subtree send-email

apply fetch-pack merge-tree send-pack

archimport filter-branch mergetool sh-setup

archive fmt-merge-msg mktag shell

bisect for-each-ref mktree shortlog

blame format-patch mv show

branch fsck name-rev show-branch

bundle fsck-objects pack-objects show-index

cat-file gc pack-redundant show-ref

check-attr get-tar-commit-id pack-refs stash

check-ref-format grep parse-remote status

checkout gui patch-id stripspace

checkout-index hash-object peek-remote submodule

cherry http-fetch prune svn

cherry-pick http-push prune-packed symbolic-ref

citool imap-send pull tag

clean index-pack push tar-tree

clone init quiltimport unpack-file

commit init-db read-tree unpack-objects

commit-tree instaweb rebase update-index

config log receive-pack update-ref

count-objects lost-found reflog update-server-info

cvsexportcommit ls-files relink upload-archive

cvsimport ls-remote remote upload-pack

cvsserver ls-tree repack var

daemon mailinfo repo-config verify-pack

describe mailsplit request-pull verify-tag

diff merge rerere whatchanged

diff-files merge-base reset write-tree

diff-index merge-file rev-list

diff-tree merge-index rev-parse gitk





Comandos de ajuda

git help

Lista dos comandos mais comuns

git <command> -h

breve ajuda

man git-<command>

git help <command>

git <command> --help

paginas de manual





Configuracao do usuario

$HOME/.gitconfig$ git config --global user.name "Seu nome"$ git config --global user.email [email protected]$ git config --global color.pager true$ git config --global color.ui auto





Configuracao do usuario$ cat .gitconfig

[user]

name = "Marcello Henrique"

email = "[email protected]"

[core]

pager = less -FRSX

editor = vim

[color]

ui = auto

[merge]

tool = vimdiff





Comando de inicializacao

$ git init

cria a area do projeto

cria o diretorio .git





O que commitar?

adicionar$ git add file$ git add .

remover$ git rm file

renomear$ git mv old new





Ignorar arquivos

$ cat .gitignore

*.o

*~





Como commitar?

$ git commit -a -m‘‘some comment’’

Vai criar um commit de tudo ou somente dos itenstrabalhados (staged)




ComandosBranchingRemotes$ mkdir project$ cd project$ git init

working tree

repository

.git

master

HEAD

index




ComandosBranchingRemotes$ echo test > test

working tree

repository

.git

master

HEAD

index

test




ComandosBranchingRemotes$ echo test > test$ git add test

working tree

repository

.git

master

HEAD

index

test

tree

52a266...

blob

9daefb... "test"




ComandosBranchingRemotes$ echo test > test$ git add test$ git commit -m‘‘test’’

Created initial commit 6f01040: test

1 files changed, 1 insertions(+), 0 deletions(-)

create mode 100644 test

working tree

repository

.git

master

HEAD

commit

6f0104...

index

test

tree

52a266...

blob

9daefb... "test"




ComandosBranchingRemotes$ echo test > test$ git add test$ git commit -m‘‘test’’$ mkdir dir$ echo foo > dir/foo$ git add dir/foo

working tree

repository

.git

master

HEAD

commit

6f0104...

index

test

tree

52a266...

blob

9daefb...

tree

cad6ae...

blob

257cc5...

tree

205f6b...

dir/foo

"test"

"dir"

"foo"




ComandosBranchingRemotes$ echo test > test$ git add test$ git commit -m‘‘test’’$ mkdir dir$ echo foo > dir/foo$ git add dir/foo$ git commit -m‘‘foo’’

Created commit 52a0ff4: foo

1 files changed, 1 insertions(+),

0 deletions(-)

create mode 100644 dir/foo

working tree

repository

.git

master

HEAD

commit

6f0104...

index

test

tree

52a266...

blob

9daefb...

tree

cad6ae...

blob

257cc5...

tree

205f6b...

commit

52a0ff...

dir/foo

"test"

"dir"

"foo"





Inspecao

$ git status

mostra. . .

staged (Modificados)

unstaged (Nao modificados)

untracked (Nao versionados)





Inspecao$ git diff

Mudancas entre ındice e os arquivos de trabalho$ git diff --cached

Mudancas entre o HEAD e o ındice$ git diff HEAD

Mudancas entre o HEAD e os arquivos de trabalho$ git diff $commit $commitMudancas entre dois commits





Inspecao

specific commit

ID. . .

full hash 6bb1270ffb60cbfef87266d2d4b4abe4218d9c68

short hash 6bb127

tag v1.5.6.1local branch masterremote branch origin/master

by message “:/some text”

checkout HEADlast fetch FETCH HEADprevious head ORIG HEAD. . .





Inspecao

Um commit antes do HEAD

HEAD^ == HEAD∼1





Inspecao

Alguns commits antes do HEAD

HEAD^^^ == HEAD∼3





Inspecao

Alguns commits antes do master

master^^^ == master∼3





Inspecao

Voce quer ver os de ontem?

@{yesterday} == HEAD@{yesterday}





Inspecao

Que tal my-other-branch em primeiro de Junho?

my-other-branch@{June.1}





Inspecao

Algumas mudancas atras do master?

master@{3}





Inspecao

Visualizacao do ultimo commit. . .$ git showcommit 83b2d051814e884a8e264127ed47552a5dcf6c1d

Author: Bart Trojanowski <[email protected]>

Date: Thu Jul 3 21:44:39 2008 -0400

changed one line

diff --git a/test b/test

index 808a2c4..99810fa 100644

--- a/test

+++ b/test

@@ -1,3 +1,3 @@

Some old text before the change.

-Some text for removal.

+Replacement line.

Some old text after the change.





Inspecao

Somente as estatısticas. . .$ git show --stat

commit 83b2d051814e884a8e264127ed47552a5dcf6c1d


Date: Thu Jul 3 21:44:39 2008 -0400

changed one line

test | 2 +-






Inspecao

Igual as infomacoes de estado do SVN. . .$ git show --name-status

commit 3d3d2989b817af3fd4fa6d63f200113bd6c94bdb


Date: Thu Jul 3 22:59:13 2008 -0400

something more interesting

A sub/bar

D sub/foo

M test





Inspecao

Rever qualquer outro commit. . .$ git show HEAD$ git show HEAD^^^$ git show master~10$ git show master@{May.16}. . .





Inspecao

Mostrar um arquivo (ou arvore) no historico. . .$ git show HEAD:file

contents...





Inspecao

Veja o historico dos commits. . .$ git logcommit 3d3d2989b817af3fd4fa6d63f200113bd6c94bdb


Date: Thu Jul 3 22:59:13 2008 -0400

most recent commit

commit 83b2d051814e884a8e264127ed47552a5dcf6c1d


Date: Thu Jul 3 21:44:39 2008 -0400

second most recent

commit 1cc1b35a611c39f49842e2ca28d40886c1ae9b7c


Date: Thu Jul 3 21:44:05 2008 -0400

middle commit

commit 411515f51a78d66a27a7d56ebe9f70dbd2bff008


Date: Thu Jul 3 21:43:36 2008 -0400

second oldest

. . .Marcello Henrique, [email protected] Git o basico 52 / 84




Inspecao

git log e impressionante!





Inspecao

Limita por faixa. . .$ git log tag..branch$ git log HEAD~10..$ git log branch1 branch2 ^common$ git log -10$ git log -10 master@{yesterday}$ git log --since="May 1" --until="June 1"





Inspecao

Limita por atributos do commit. . .$ git log --author=fred$ git log --committer=joe$ git log --grep="commit.*message.*text"





Inspecao

Presquisa por uma mudanca. . .$ git log -S‘‘some code change’’$ git log --pickaxe-regex -S‘‘some.*code.*change’’





Inspecao

Limita por mudancas especıficas no caminho. . .$ git log -- some/file





Inspecao

Outros modos de pesquisa. . .$ git grep -e "pattern" -- some/file$ git grep -e "pattern" branch -- some/file





Referencias

Mais rapido

Mais maleavel

Discartavel

3 tipos basico





Local branches

$ git branch -l

branch1

branch2

* master

.git/refs/heads/<branch>





tags

$ git tag -l

tag1

tag2

tag3

.git/refs/tags/<tag>





Remote branches

$ git branch -r

fred/master

joe/master

joe/another-branch

.git/refs/remotes/<remote>/<branch>





Remote branches

$ git branch name commit

Nova branch “name” sobre HEAD ou especıfico commit





Remote branches

$ git checkout -f name

Atualiza os arquivos no branch “name”

Optionalmente forca subscrever mudancas nos arquivos





Remote branches

$ git checkout -b name commit

Atualiza os arquivos criando “name” branch





Remote branches

$ git checkout nameerror: You have local changes to ’filename’;

cannot switch branches.$ git checkout -m name

merge outstanding diff onto branch “name”

Pode resultar em conflito





Comecamos com uma arvore

masterA




ComandosBranchingRemotes$ git checkout -b

bug-fix

master

HEAD

bug−fix A




ComandosBranchingRemotes$ git commit -a -m‘‘B’’

master

HEAD

Bbug−fix

A




ComandosBranchingRemotes$ git commit -a -m‘‘C’’

master

HEAD

C

B

bug−fix

A





Voce tem uma ideia arrasadora

master

HEAD

C

B

bug−fix

A





Voce tem uma ideia arrasadora$ git checkout -b wicked

master

master

HEADC

B

bug−fix

wicked

A




ComandosBranchingRemotes$ git commit -a -m‘‘D’’

master

HEAD

C

B

D

bug−fix

wicked

A




ComandosBranchingRemotes$ git commit -a -m‘‘E’’

master

HEAD

C

B

E

D

bug−fix

wicked

A





Voce chegou em um pontoaceitavel

master

HEAD

C

B

E

D

bug−fix

wicked

A





Voce chegou em um pontoaceitavel$ git tag -a -m‘‘got

somewhere’’ good

master

HEAD

C

B

goodE

D

bug−fix

wicked

A





Gerenciar correcoes de bug

master

HEAD

C

B

goodE

D

bug−fix

wicked

A




ComandosBranchingRemotes$ git checkout bug-fix

master

HEAD

C

B

goodE

D

bug−fix

wicked

A




ComandosBranchingRemotes$ git commit -a -m‘‘F’’

master

HEAD

F

C

B

goodE

D

bug−fix wicked

A





Voce so pensa na sua versaoboa. . .

master

HEAD

F

C

B

goodE

D

bug−fix wicked

A





Voce so pensa na sua versaoboa. . .$ git checkout wicked

HEAD

F

C

B

goodE

D

bug−fix wicked

A master





. . . Entao voce termina suafuncionalidade arrasadora$ git commit -a -m‘‘G’’

HEAD

F

G

C

B

goodE

D

bug−fix

wicked

A master





Funcionalidade pronta

bug estao corrigidos

. . . hora de mesclar!HEAD

F

G

C

B

goodE

D

bug−fix

wicked

A master




ComandosBranchingRemotes$ git checkout master

master

HEAD

F

G

C

B

goodE

D

bug−fix

wicked

A




ComandosBranchingRemotes$ git reset --hard bug-fix

master

HEAD

F

G

C

B

goodE

D

bug−fix

wicked

A




ComandosBranchingRemotes$ git merge wicked

master

HEAD

H

F

G

C

B

goodE

D

bug−fix

wicked

A





Mesclando

$ git merge <branch> ...

Mescla multiplas branches

Cria commit com 2+ pais

Pode causar conflitoNota: Requer intervencao do usuario





Mesclando

Mais um exemplo

A

one





Mesclando

Duas branches

A

B C

one two





Mesclando$ git checkout -b three

two

A

B C

one twothree





Mesclando$ git checkout -b three

two$ git merge one

A

B C

one two

three

D





Mesclando

A

B C

D

E F

Gone two

three





Mesclando$ git checkout three

A

B C

D

E F

Gone two

three





Mesclando$ git checkout three$ git merge one two

A

B C

D

E F

Gone two

three

H





Mesclando$ git checkout three$ git merge one two

“octopus”

A

B C

D

E F

Gone two

three

H





Rebase

$ git rebase <branch>

Tranfere novos trabalhos para uma nova base

Pode causar conflitoNota: Requer intervencao do usuario





Diferenca entre merge e rebase

C

B

E

D

master

test

A

merge rebase

C

B

E

D

master

test

A

Temos 2 arvores identicas






C

B

E

D

master

test

A

merge rebase

C

B

E

D

master

test

A

F

$ git merge master






C

B

E

D

master

test

A

merge rebase

C

B

E

D

master

test

A

F

Que facil!






C

B

E

D

master

test

A

merge rebase

C

B

E

D

master

test

A

F

$ git rebase master






C

B

E

D

master

test

A

merge rebase

C

B

E

D

master

test

A

F

E’

D’

$ git rebase master






C

B

E

D

master

test

A

merge rebase

C

B

E

D

master

test

A

F

E’

D’ e

d

$ git rebase master






C

B

E

D

master

test

A

merge rebase

C

B

E

D

master

test

A

F

E’

D’

$ git rebase master






C

B

E

D

master

test

A

merge rebase

C

B

master

test

A

F

E’

D’





Remotes

$ git clone <remote>

Replica repositorio remoto

Preenche o novo repositorio

Atualiza novas arvores de trabalho





Protocolos

Repositorio local

/home/git/project.git/

file:///home/git/project.git/

Protocolo http

http://repo.or.cz/r/git.git

Protocolo nativo git

git://repo.or.cz/git.git

Protocolo ssh

ssh://[email protected]/~git/project.git/

[email protected]/~git/project.git/



A v0.1.0

B

C v0.2.0

F

master

repo.or.cz

git://repo.or.cz/project.git

A v0.1.0

B

C v0.2.0

F

master

repo.or.cz

$ git clone ssh+git://repo.or.cz/project.git

A v0.1.0

B

C v0.2.0

F

master

repo.or.cz local


Initialize project/.git

Initialized empty Git repository in /tmp/project/.git/

remote: Counting objects: 77575, done.

remote: Compressing objects: 100% (26407/26407), done.

remote: Total 77575 (delta 55750), reused 71007 (delta 49775)

Receiving objects: 100% (77575/77575), 22.87 MiB | 798 KiB/s, done.

Resolving deltas: 100% (55750/55750), done.

Checking out files: 100% (1396/1396), done.

A v0.1.0

B

C v0.2.0

F

master

repo.or.cz local

$ git clone ssh+git://repo.or.cz/project.git build-tree

Initialize build-tree/.git

Initialized empty Git repository in /tmp/build-tree/.git/







A v0.1.0

B

C v0.2.0

F

master

repo.or.cz local










A v0.1.0

B

C v0.2.0

F

master

repo.or.cz local

A v0.1.0

B

C v0.2.0

F

origin/master





A v0.1.0

B

C v0.2.0

F

master

"origin" local

A v0.1.0

B

C v0.2.0

F

origin/master










A v0.1.0

B

C v0.2.0

F

master

"origin" local

A v0.1.0

B

C v0.2.0

F

origin/master

master

/tmp/project/|−− .git/|−− bar‘−− sub/ ‘−− foo$ git clone ssh+git://repo.or.cz/project.git









A v0.1.0

B

C v0.2.0

F

master

"origin" local

A v0.1.0

B

C v0.2.0

F

origin/master

master

/tmp/project/|−− .git/|−− bar‘−− sub/ ‘−− foo

$ git branch -a

* master

origin/master

$ git tag -l

v0.1.0

v0.2.0

A v0.1.0

B

C v0.2.0

F

master

"origin" local

A v0.1.0

B

C v0.2.0

F

origin/master

master


G

H

A v0.1.0

B

C v0.2.0

F

master

"origin" local

A v0.1.0

B

C v0.2.0

F

origin/master

master


G

H

$ git fetch

A v0.1.0

B

C v0.2.0

F

master

"origin" local

A v0.1.0

B

C v0.2.0

F

origin/master

master


G

H

$ git fetch




Receiving objects: 100% (190/190), 69.53 KiB, done.

Resolving deltas: 100% (170/170), completed with 40 local objects.

From mail.jukie.net:work/oclug/intro-to-git

573ff80..06e3703 master -> origin/master

A v0.1.0

B

C v0.2.0

F

master

"origin" local

A v0.1.0

B

C v0.2.0

F

origin/master

master


G

H

G

H

$ git fetch




Receiving objects: 100% (190/190), 69.53 KiB, done.

Resolving deltas: 100% (170/170), completed with 40 local objects.

From mail.jukie.net:work/oclug/intro-to-git

573ff80..06e3703 master -> origin/master

A v0.1.0

B

C v0.2.0

F

master

"origin" local

A v0.1.0

B

C v0.2.0

F

origin/master

master


G

H

G

H

. . . Nenhuma mudanca no disco?

A v0.1.0

B

C v0.2.0

F

master

"origin" local

A v0.1.0

B

C v0.2.0

F

origin/master

master


G

H

G

H

git fetch somente atualiza DAG

A v0.1.0

B

C v0.2.0

F

master

"origin" local

A v0.1.0

B

C v0.2.0

F

origin/master

master

/tmp/project/|−− .git/|−− bar‘−− sub/ |−− fiz ‘−− foo

G

H

G

H

git merge origin/master

fast-forwards master para origin/mastere atualiza a arvore de trabalho

A v0.1.0

B

C v0.2.0

F

master

"origin" local

A v0.1.0

B

C v0.2.0

F

origin/master

master


G

H

G

H

git fetch + git merge = git pull

A v0.1.0

B

C v0.2.0

F

master

"origin" local

A v0.1.0

B

C v0.2.0

F

origin/master

master


G

H

G

H

Vamos fazer alguns commit locais

A v0.1.0

B

C v0.2.0

F

master

"origin" local

A v0.1.0

B

C v0.2.0

F

origin/master

master


G

H

G

H

$ git commit -a -m‘‘I’’

A v0.1.0

B

C v0.2.0

F

master

"origin" local

A v0.1.0

B

C v0.2.0

F

origin/master

master


G

H

G

H

I

$ git commit -a -m‘‘I’’

Created commit b618aed: I


A v0.1.0

B

C v0.2.0

F

master

"origin" local

A v0.1.0

B

C v0.2.0

F

origin/master

master


G

H

G

H

I

A v0.1.0

B

C v0.2.0

F

master

"origin" local

A v0.1.0

B

C v0.2.0

F

origin/master

master


G

H

G

H

I

$ git push

A v0.1.0

B

C v0.2.0

F

master

"origin" local

A v0.1.0

B

C v0.2.0

F

origin/master

master


G

H

G

H

II

$ git push

Counting objects: 9, done.

Compressing objects: 100% (5/5), done.

Writing objects: 100% (5/5), 810 bytes, done.

Total 5 (delta 4), reused 0 (delta 0)

refs/heads/master: 9ddc135 -> 15b67c0

To ssh+git://repo.or.cz/project.git

9ddc135..15b67c0 master -> master

A v0.1.0

B

C v0.2.0

F

master

"origin" local

A v0.1.0

B

C v0.2.0

F

origin/master

master


G

H

G

H

II

A v0.1.0

B

C v0.2.0

F

master

"origin"

G

H

I

foo.com

. . . Entretanto, noutros locais na Internet . . .

A v0.1.0

B

C v0.2.0

F

master

"origin"

G

H

I

foo.com

Fred clones o projeto.

A v0.1.0

B

C v0.2.0

F

master

"origin"

G

H

I

A v0.1.0

B

C v0.2.0

F

master

foo.com

G

H

I

Fred clones o projeto.

A v0.1.0

B

C v0.2.0

F

master

"origin"

G

H

I

A v0.1.0

B

C v0.2.0

F

master

foo.com

G

H

I

J

. . . e faz mais mudancas.

A v0.1.0

B

C v0.2.0

F

master

"origin"

G

H

I

A v0.1.0

B

C v0.2.0

F

master

foo.com

G

H

I

J

Fred nao pode empurrar (push).

A v0.1.0

B

C v0.2.0

F

master

"origin"

G

H

I

A v0.1.0

B

C v0.2.0

F

master

foo.com

G

H

I

J

From: [email protected] Subject: I fixed a bug

Please pull from

http://foo.com/project.git/

-Fred

A v0.1.0

B

C v0.2.0

F

master

"origin"

G

H

I

A v0.1.0

B

C v0.2.0

F

master

foo.com

G

H

I

J

local

A v0.1.0

B

C v0.2.0

F

ori

gin

/maste

r

master


G

H

I

K

From: [email protected] Subject: I fixed a bug

Please pull from

http://foo.com/project.git/

-Fred

A v0.1.0

B

C v0.2.0

F

master

"origin"

G

H

I

A v0.1.0

B

C v0.2.0

F

master

foo.com

G

H

I

J

local

A v0.1.0

B

C v0.2.0

F

ori

gin

/maste

r

master


G

H

I

K

$ git remote add fred http://foo.com/project.git/

A v0.1.0

B

C v0.2.0

F

master

"origin"

G

H

I

A v0.1.0

B

C v0.2.0

F

master

"fred"

G

H

I

J

local

A v0.1.0

B

C v0.2.0

F


G

Hori

gin

/maste

r

master

I

K

$ git remote add fred http://foo.com/project.git/

A v0.1.0

B

C v0.2.0

F

master

"origin"

G

H

I

A v0.1.0

B

C v0.2.0

F

master

"fred"

G

H

I

J

local

A v0.1.0

B

C v0.2.0

F


G

Hori

gin

/maste

r

master

I

K

$ git fetch fred

A v0.1.0

B

C v0.2.0

F

master

"origin"

G

H

I

A v0.1.0

B

C v0.2.0

F

master

"fred"

G

H

I

J

local


A v0.1.0

B

C v0.2.0

FG

Hori

gin

/maste

r

master

I

K

$ git fetch fred

A v0.1.0

B

C v0.2.0

F

master

"origin"

G

H

I

A v0.1.0

B

C v0.2.0

F

master

"fred"

G

H

I

J

local


A v0.1.0

B

C v0.2.0

FG

Hori

gin

/maste

r

master

I

K J

fred

/maste

r

$ git fetch fred

A v0.1.0

B

C v0.2.0

F

master

"origin"

G

H

I

A v0.1.0

B

C v0.2.0

F

master

"fred"

G

H

I

J

local


A v0.1.0

B

C v0.2.0

FG

Hori

gin

/maste

r

master

I

K J

fred

/maste

r

A v0.1.0

B

C v0.2.0

F

master

"origin"

G

H

I

A v0.1.0

B

C v0.2.0

F

master

"fred"

G

H

I

J

local


A v0.1.0

B

C v0.2.0

FG

Hori

gin

/maste

r

master

I

K J

fred

/maste

r

$ git log fred/master

A v0.1.0

B

C v0.2.0

F

master

"origin"

G

H

I

A v0.1.0

B

C v0.2.0

F

master

"fred"

G

H

I

J

local


A v0.1.0

B

C v0.2.0

FG

Hori

gin

/maste

r

master

I

K J

fred

/maste

r

$ git log fred/master$ git log fred/master master

A v0.1.0

B

C v0.2.0

F

master

"origin"

G

H

I

A v0.1.0

B

C v0.2.0

F

master

"fred"

G

H

I

J

local


A v0.1.0

B

C v0.2.0

FG

Hori

gin

/maste

r

master

I

K J

fred

/maste

r

$ git log fred/master$ git log fred/master master$ git log -p fred/master master

A v0.1.0

B

C v0.2.0

F

master

"origin"

G

H

I

A v0.1.0

B

C v0.2.0

F

master

"fred"

G

H

I

J

local


A v0.1.0

B

C v0.2.0

FG

Hori

gin

/maste

r

master

I

K J

fred/m

aste

r

$ git checkout -b fred-fix fred/master

A v0.1.0

B

C v0.2.0

F

master

"origin"

G

H

I

A v0.1.0

B

C v0.2.0

F

master

"fred"

G

H

I

J

local


A v0.1.0

B

C v0.2.0

FG

Hori

gin

/maste

r

master

I

K J

fred/m

aste

r

fred−fix

$ git checkout -b fred-fix fred/master

A v0.1.0

B

C v0.2.0

F

master

"origin"

G

H

I

A v0.1.0

B

C v0.2.0

F

master

"fred"

G

H

I

J

local


A v0.1.0

B

C v0.2.0

FG

Hori

gin

/maste

r

master

I

K J

fred/m

aste

r

fred−fix

$ git checkout master

A v0.1.0

B

C v0.2.0

F

master

"origin"

G

H

I

A v0.1.0

B

C v0.2.0

F

master

"fred"

G

H

I

J

local


A v0.1.0

B

C v0.2.0

FG

Hori

gin

/maste

r

master

I

K J

fred/m

aste

r

fred−fixL

$ git checkout master$ git merge fred-fix

A v0.1.0

B

C v0.2.0

F

master

"origin"

G

H

I

A v0.1.0

B

C v0.2.0

F

master

"fred"

G

H

I

J

local


A v0.1.0

B

C v0.2.0

FG

Hori

gin

/maste

r

master

I

K J

fred/m

aste

r

L

$ git checkout master$ git merge fred-fix$ git branch -d fred-fix

A v0.1.0

B

C v0.2.0

F

master

"origin"

G

H

I

A v0.1.0

B

C v0.2.0

F

master

"fred"

G

H

I

J

local


A v0.1.0

B

C v0.2.0

FG

Hori

gin

/maste

r

master

I

K J

fred/m

aste

r

L

$ git push

A v0.1.0

B

C v0.2.0

F

master

"origin"

G

H

I

A v0.1.0

B

C v0.2.0

F

master

"fred"

G

H

I

J

local


A v0.1.0

B

C v0.2.0

FG

Hori

gin

/maste

r

master

I

K J

fred/m

aste

r

L

K J

L

$ git push

A v0.1.0

B

C v0.2.0

F

master

"origin"

G

H

I

A v0.1.0

B

C v0.2.0

F

master

"fred"

G

H

I

J

local


A v0.1.0

B

C v0.2.0

FG

H

ori

gin

/maste

r master

I

K J

fred/m

aste

r

L

K J

L

$ git push

A v0.1.0

B

C v0.2.0

F

master

"origin"

G

H

I

A v0.1.0

B

C v0.2.0

F

master

"fred"

G

H

I

J

local


A v0.1.0

B

C v0.2.0

FG

H

ori

gin

/maste

r master

I

K J

fred/m

aste

r

L

K J

L



Ambientes Graficos

gitk

Agradavel visualizacao da arvore de revisoes

git gui

Executar tarefas sao banais em um ambiente de janelasEx: add/rm arquivos, fazer commits, branch, etc. . .





Objetos perdidos

Lembram dos objetos perdidos ?





Objetos perdidos

.git/objects

|-- 23


|-- 76

| ‘-- 49f82d40a98b1ba59057798e47aab2a99a11d3

|-- c4


|-- e7

| ‘-- 4be61128eef713459ca4e32398d689fe80864e

|-- info

| ‘-- packs

‘-- pack







Objetos perdidos$ git gc

Counting objects: 636, done.

Compressing objects: 100% (635/635), done.

Writing objects: 100% (636/636), done.

Total 636 (delta 486), reused 0 (delta 0)

Removing duplicate objects: 100% (256/256), done.

GC executa automaticamente quando voce obtem 6700objetos(configuravel)





Outras Leituras

Site oficialhttp://git.or.cz

Git wikigit.or.cz/gitwiki

Podcast (Scott Chacon)GitCasts.com

Bart Jukiehttp://www.jukie.net/∼bart/blog/

Apresentacao Originalgit://tachyon.jukie.net/intro-to-git.git/





Mais links

git-scmhttp://www.git-scm.com

Vıdeo Linus sobre o githttp://www.youtube.com/watch?v=4XpnKHJAok8

Meu bloghttp://faraohh.blogspot.com

Cercomp/UFGhttp://www.cercomp.ufg.br





The truth credithttp://www.jukie.net/~bart/blog/


Bart TrojanowskiHi Marcello,

* Marcello Henrique <[email protected]> [081023

15:12]: > I seen that you use beamer, you

could share their sources in latex/beamer? ( >

http://excess.org/article/2008/07/ogre-git-tutorial/)

Here you go...

git://tachyon.jukie.net/intro-to-git.git/

> Would like to create a presentation for

beginners.

I grant you rights to the material if used with

attribution.

Cheers,

-Bart

http://www.jukie.net/~bart/blog/




Perguntas?

Perguntas?





Perguntas?

Obrigado!



intro to git

Technology