Rodrigo Branas – @rodrigobranas - http://www.agilecode.com.br

#5 - Git - Contribuindo com um repositório

Rodrigo Branasrodrigo.branas@agilecode.com.br

http://www.agilecode.com.br

• Arquiteto de Software na Gennera • Professor na Agile Code • Autor na Java Magazine e PacktPub • Palestrante

http://www.youtube.com/rodrigobranas

Push, ou empurrar, é a ação de atualizar uma referência remota a partir

de uma referência local, enviando os objetos necessários para satisfazer as

referências atualizadas.

git push

Cade o repositório remoto?

Fundado em 2008, o GitHub é a maior plataforma de compartilhamento e

hospedagem de código do mundo com 10 milhões de usuários e mais de 20

milhões de repositórios.

Criando um repositório remoto...

git add remote origin https://github.com/rodrigobranas/gitpresentation

git remote

git remote -v ou --verbose

git push origin master

Pull, ou puxar, é a ação de atualizar uma referência local a partir de uma

referência remote, trazendo os objetos necessários para satisfazer as

referências atualizadas.

git pull origin master

git clone https://github.com/rodrigobranas/gitpresentation gitpresentation2

cd gitpresentation2

echo h > h.txt git add -A git commit -m "h.txt" git push origin master

cd gitpresentation

git log --oneline --decorate --all --graph

git pull origin master

master

commit cc8a tree 10e6 parent d67a parent fde2

commit c5b5 tree 82b4 parent cc8a

HEAD

commit c85e tree a1bb parent cc8a

commit 270e tree 82b4 parent c85e parent c5b5

master

commit cc8a tree 10e6 parent d67a parent fde2

commit c5b5 tree 82b4 parent cc8a

HEAD

commit c85e tree a1bb parent cc8a

commit 270e tree 82b4 parent c85e parent c5b5

commit 119e tree 1e57 parent 270e

origin/master

git log --oneline --decorate --all --graph

O comando git pull faz merge automaticamente

cd gitpresentation2 echo i > i.txt git add -A git commit -m "i.txt" git push origin master

cd presentation git fetch

master

commit cc8a tree 10e6 parent d67a parent fde2

commit c5b5 tree 82b4 parent cc8a

HEAD

commit c85e tree a1bb parent cc8a

commit 270e tree 82b4 parent c85e parent c5b5

commit 119e tree 1e57 parent 270e

origin/master

master

commit cc8a tree 10e6 parent d67a parent fde2

commit c5b5 tree 82b4 parent cc8a

HEAD

commit c85e tree a1bb parent cc8a

commit 270e tree 82b4 parent c85e parent c5b5

commit 119e tree 1e57 parent 270e

origin/mastercommit a4b1 tree 5ee6 parent 119e

git log --oneline --decorate --all --graph

git diff master origin/master

git merge origin/master

master

commit cc8a tree 10e6 parent d67a parent fde2

commit c5b5 tree 82b4 parent cc8a

HEAD

commit c85e tree a1bb parent cc8a

commit 270e tree 82b4 parent c85e parent c5b5

commit 119e tree 1e57 parent 270e

origin/mastercommit a4b1 tree 5ee6 parent 119e

master

commit cc8a tree 10e6 parent d67a parent fde2

commit c5b5 tree 82b4 parent cc8a

HEAD

commit c85e tree a1bb parent cc8a

commit 270e tree 82b4 parent c85e parent c5b5

commit 119e tree 1e57 parent 270e

origin/mastercommit a4b1 tree 5ee6 parent 119e

git log --oneline --decorate --all --graph

E se eu quiser apenas consultar o repositório remoto?

cd gitpresentation2

echo j > j.txt git add -A git commit -m "j.txt" git push origin master

cd gitpresentation

git ls-remote

git log --oneline --decorate --all --graph

git fetch

git log --oneline --decorate --all --graph

git merge origin/master

git log --oneline --decorate --all --graph

Rodrigo Branas

Site: http://www.agilecode.com.br Twitter: @rodrigobranas Facebook: http://www.facebook.com/canalrodrigobranas SlideShare: http://www.slideshare.com/rodrigobranas YouTube: http://www.youtube.com/rodrigobranas LinkedIn: http://br.linkedin.com/in/rodrigobranas +Plus: https://plus.google.com/+RodrigoBranas GitHub: http://www.github.com/rodrigobranas