Presentacion git

Git & Github.Nacho Martín

Git

Sistema de control de versiones

Sistema de control de versiones

Distribuido

Servidor

versión 3

versión 2

versión 1

fichero

Ordenador 1

fichero

Ordenador 2

Ordenador 2

versión 3

versión 2

versión 1

fichero

Ordenador 3

versión 3

versión 2

versión 1

fichero

Ordenador 1

versión 3

versión 2

versión 1

fichero

Ventajas (y desventajas)

Muy rápido

Ramas fáciles

Flexible

Más difícil

Más difícil¿ ?

git init

git clone https://github.com/symfony/symfony.git

o

echo "hola mundo" > saludo

echo "hola mundo" > saludo

git status

echo "hola mundo" > saludo

git status

# On branch master## Initial commit## Untracked files:# (use "git add <file>..." to include in what will be committed)## saludonothing added to commit but untracked files present (use "git add" to track)

echo "hola mundo" > saludo

git status

# On branch master## Initial commit## Untracked files:# (use "git add <file>..." to include in what will be committed)## saludonothing added to commit but untracked files present (use "git add" to track)

echo "hola mundo" > saludo

git status

# On branch master## Initial commit## Untracked files:# (use "git add <file>..." to include in what will be committed)## saludonothing added to commit but untracked files present (use "git add" to track)

git add saludo

git add saludo

git status

git add saludo

git status

# On branch master## Initial commit## Changes to be committed:# (use "git rm --cached <file>..." to unstage)## new file: saludo#

git commit -m "Commit inicial"

git commit -m "Commit inicial"

[master (root-commit) df5839d] Commit inicial 1 files changed, 1 insertions(+), 0 deletions(-) create mode 100644 saludo

git commit -m "Commit inicial"

[master (root-commit) df5839d] Commit inicial 1 files changed, 1 insertions(+), 0 deletions(-) create mode 100644 saludo

git log

git commit -m "Commit inicial"

[master (root-commit) df5839d] Commit inicial 1 files changed, 1 insertions(+), 0 deletions(-) create mode 100644 saludo

git log

commit df5839d78e7b9c14672ca722c80f2a5a897ebfbaAuthor: Nacho Martín <nitram.ohcan@gmail.com>Date: Tue Nov 8 14:43:38 2011 +0100

Commit inicial

git commit -m "Commit inicial"

[master (root-commit) df5839d] Commit inicial 1 files changed, 1 insertions(+), 0 deletions(-) create mode 100644 saludo

git log

commit df5839d78e7b9c14672ca722c80f2a5a897ebfbaAuthor: Nacho Martín <nitram.ohcan@gmail.com>Date: Tue Nov 8 14:43:38 2011 +0100

Commit inicial

git commit -m "Commit inicial"

[master (root-commit) df5839d] Commit inicial 1 files changed, 1 insertions(+), 0 deletions(-) create mode 100644 saludo

git log

commit df5839d78e7b9c14672ca722c80f2a5a897ebfbaAuthor: Nacho Martín <nitram.ohcan@gmail.com>Date: Tue Nov 8 14:43:38 2011 +0100

Commit inicial

git commit -m "Commit inicial"

[master (root-commit) df5839d] Commit inicial 1 files changed, 1 insertions(+), 0 deletions(-) create mode 100644 saludo

git log

commit df5839d78e7b9c14672ca722c80f2a5a897ebfbaAuthor: Nacho Martín <nitram.ohcan@gmail.com>Date: Tue Nov 8 14:43:38 2011 +0100

Commit inicial

gitk o GitX

master

echo "como va todo" >> saludo

master Commit inicial

Cambios sin commitear

echo "como va todo" >> saludo

master Commit inicial

Cambios sin commitear

git add saludogit commit -m "Amplio saludo"

master

Commit inicial

Amplio saludo

echo "como va todo" >> saludo

master Commit inicial

Cambios sin commitear

git commit -a -m "Amplio saludo"

master

Commit inicial

Amplio saludo

echo "como va todo" >> saludo

master Commit inicial

Cambios sin commitear

git commit -a -m "Amplio saludo"

master

Commit inicial

Amplio saludo

Solo para ficherosya trackeados

master

master

Commit inicial ( df5839d78e7... )

Amplio saludo

master

Commit inicial ( df5839d78e7... )

Amplio saludo

git checkout df5839

master

Commit inicial

Amplio saludo

master

Commit inicial ( df5839d78e7... )

Amplio saludo

git checkout df5839

master

Commit inicial

Amplio saludo

git checkout master

master

Commit inicial ( df5839d78e7... )

Alicia Github

master

masterremotes/origin/

git remote add origin git://github.com/user/repo.git

Alicia Github

master

masterremotes/origin/masterremotes/origin/

git fetch origin

Alicia Github

git merge origin/master

masterremotes/origin/master masterremotes/origin/

git fetch origin

Alicia Github

git merge origin/master

masterremotes/origin/master masterremotes/origin/

git fetch origin }git pull origin master

Alicia Github

master

masterremotes/origin/masterremotes/origin/masterremotes/origin/masterremotes/origin/

Alicia Github

git push origin master

masterremotes/origin/master masterremotes/origin/

svn update git pull

svn add archivo git add archivo

svn update -r git checkout

svn commit -mgit commit -a -mgit push

Ramas

git checkout -b facebook

master facebook

master

facebook

2 commits más tarde...

master

facebook

git checkout master

git checkout mastergit merge facebook

master facebook

git merge facebookgit checkout master

master

git branch -d facebook

master

facebook

master

facebook

master

facebook

git checkout master

master

facebook

arreglamos bug en master (y hacemos commit)

master

facebook

git checkout facebook

master facebook

git merge master

facebook

master

master

facebook

git rebase master

meld

En el tintero...

git rm <fichero>git mv <fichero> <destino>git reset d5f64567 [--hard]git tag version-1.0 d5f64567git cherry-pickgit submodule

Symfony2 ♥ Git

bin/vendors

deps deps.lock

[symfony] git=http://github.com/symfony/symfony.git version=v2.0.5

deps

deps.locksymfony 7f21a5e9792f892166a550bb5579

prioritario

git clone <repositorio>git fetch origingit reset --hard <version>

bin/vendors install {

Github

Repo

MiRepo

Fork!

Work

MiRepo'

Repo'Pull request

PARA QUÉ?¿

http://www.flickr.com/photos/deadwords/2473829859/

Preguntas?¿

Gracias

nitram.ohcan@gmail.com

limenius.com

@nacmartin