Presentacion git
-
Upload
nacho-martin -
Category
Technology
-
view
5.577 -
download
1
description
Transcript of Presentacion git
![Page 1: Presentacion git](https://reader038.fdocument.pub/reader038/viewer/2022102805/5557ac35d8b42a696c8b4a8d/html5/thumbnails/1.jpg)
Git & Github.Nacho Martín
![Page 2: Presentacion git](https://reader038.fdocument.pub/reader038/viewer/2022102805/5557ac35d8b42a696c8b4a8d/html5/thumbnails/2.jpg)
Git
![Page 3: Presentacion git](https://reader038.fdocument.pub/reader038/viewer/2022102805/5557ac35d8b42a696c8b4a8d/html5/thumbnails/3.jpg)
Sistema de control de versiones
![Page 4: Presentacion git](https://reader038.fdocument.pub/reader038/viewer/2022102805/5557ac35d8b42a696c8b4a8d/html5/thumbnails/4.jpg)
Sistema de control de versiones
Distribuido
![Page 5: Presentacion git](https://reader038.fdocument.pub/reader038/viewer/2022102805/5557ac35d8b42a696c8b4a8d/html5/thumbnails/5.jpg)
Servidor
versión 3
versión 2
versión 1
fichero
Ordenador 1
fichero
Ordenador 2
![Page 6: Presentacion git](https://reader038.fdocument.pub/reader038/viewer/2022102805/5557ac35d8b42a696c8b4a8d/html5/thumbnails/6.jpg)
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
![Page 7: Presentacion git](https://reader038.fdocument.pub/reader038/viewer/2022102805/5557ac35d8b42a696c8b4a8d/html5/thumbnails/7.jpg)
Ventajas (y desventajas)
![Page 8: Presentacion git](https://reader038.fdocument.pub/reader038/viewer/2022102805/5557ac35d8b42a696c8b4a8d/html5/thumbnails/8.jpg)
Muy rápido
![Page 9: Presentacion git](https://reader038.fdocument.pub/reader038/viewer/2022102805/5557ac35d8b42a696c8b4a8d/html5/thumbnails/9.jpg)
![Page 10: Presentacion git](https://reader038.fdocument.pub/reader038/viewer/2022102805/5557ac35d8b42a696c8b4a8d/html5/thumbnails/10.jpg)
Ramas fáciles
![Page 11: Presentacion git](https://reader038.fdocument.pub/reader038/viewer/2022102805/5557ac35d8b42a696c8b4a8d/html5/thumbnails/11.jpg)
![Page 12: Presentacion git](https://reader038.fdocument.pub/reader038/viewer/2022102805/5557ac35d8b42a696c8b4a8d/html5/thumbnails/12.jpg)
Flexible
![Page 13: Presentacion git](https://reader038.fdocument.pub/reader038/viewer/2022102805/5557ac35d8b42a696c8b4a8d/html5/thumbnails/13.jpg)
![Page 14: Presentacion git](https://reader038.fdocument.pub/reader038/viewer/2022102805/5557ac35d8b42a696c8b4a8d/html5/thumbnails/14.jpg)
Más difícil
![Page 15: Presentacion git](https://reader038.fdocument.pub/reader038/viewer/2022102805/5557ac35d8b42a696c8b4a8d/html5/thumbnails/15.jpg)
Más difícil¿ ?
![Page 16: Presentacion git](https://reader038.fdocument.pub/reader038/viewer/2022102805/5557ac35d8b42a696c8b4a8d/html5/thumbnails/16.jpg)
![Page 17: Presentacion git](https://reader038.fdocument.pub/reader038/viewer/2022102805/5557ac35d8b42a696c8b4a8d/html5/thumbnails/17.jpg)
git init
git clone https://github.com/symfony/symfony.git
o
![Page 18: Presentacion git](https://reader038.fdocument.pub/reader038/viewer/2022102805/5557ac35d8b42a696c8b4a8d/html5/thumbnails/18.jpg)
echo "hola mundo" > saludo
![Page 19: Presentacion git](https://reader038.fdocument.pub/reader038/viewer/2022102805/5557ac35d8b42a696c8b4a8d/html5/thumbnails/19.jpg)
echo "hola mundo" > saludo
git status
![Page 20: Presentacion git](https://reader038.fdocument.pub/reader038/viewer/2022102805/5557ac35d8b42a696c8b4a8d/html5/thumbnails/20.jpg)
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)
![Page 21: Presentacion git](https://reader038.fdocument.pub/reader038/viewer/2022102805/5557ac35d8b42a696c8b4a8d/html5/thumbnails/21.jpg)
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)
![Page 22: Presentacion git](https://reader038.fdocument.pub/reader038/viewer/2022102805/5557ac35d8b42a696c8b4a8d/html5/thumbnails/22.jpg)
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)
![Page 23: Presentacion git](https://reader038.fdocument.pub/reader038/viewer/2022102805/5557ac35d8b42a696c8b4a8d/html5/thumbnails/23.jpg)
git add saludo
![Page 24: Presentacion git](https://reader038.fdocument.pub/reader038/viewer/2022102805/5557ac35d8b42a696c8b4a8d/html5/thumbnails/24.jpg)
git add saludo
git status
![Page 25: Presentacion git](https://reader038.fdocument.pub/reader038/viewer/2022102805/5557ac35d8b42a696c8b4a8d/html5/thumbnails/25.jpg)
git add saludo
git status
# On branch master## Initial commit## Changes to be committed:# (use "git rm --cached <file>..." to unstage)## new file: saludo#
![Page 26: Presentacion git](https://reader038.fdocument.pub/reader038/viewer/2022102805/5557ac35d8b42a696c8b4a8d/html5/thumbnails/26.jpg)
git commit -m "Commit inicial"
![Page 27: Presentacion git](https://reader038.fdocument.pub/reader038/viewer/2022102805/5557ac35d8b42a696c8b4a8d/html5/thumbnails/27.jpg)
git commit -m "Commit inicial"
[master (root-commit) df5839d] Commit inicial 1 files changed, 1 insertions(+), 0 deletions(-) create mode 100644 saludo
![Page 28: Presentacion git](https://reader038.fdocument.pub/reader038/viewer/2022102805/5557ac35d8b42a696c8b4a8d/html5/thumbnails/28.jpg)
git commit -m "Commit inicial"
[master (root-commit) df5839d] Commit inicial 1 files changed, 1 insertions(+), 0 deletions(-) create mode 100644 saludo
git log
![Page 29: Presentacion git](https://reader038.fdocument.pub/reader038/viewer/2022102805/5557ac35d8b42a696c8b4a8d/html5/thumbnails/29.jpg)
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 <[email protected]>Date: Tue Nov 8 14:43:38 2011 +0100
Commit inicial
![Page 30: Presentacion git](https://reader038.fdocument.pub/reader038/viewer/2022102805/5557ac35d8b42a696c8b4a8d/html5/thumbnails/30.jpg)
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 <[email protected]>Date: Tue Nov 8 14:43:38 2011 +0100
Commit inicial
![Page 31: Presentacion git](https://reader038.fdocument.pub/reader038/viewer/2022102805/5557ac35d8b42a696c8b4a8d/html5/thumbnails/31.jpg)
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 <[email protected]>Date: Tue Nov 8 14:43:38 2011 +0100
Commit inicial
![Page 32: Presentacion git](https://reader038.fdocument.pub/reader038/viewer/2022102805/5557ac35d8b42a696c8b4a8d/html5/thumbnails/32.jpg)
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 <[email protected]>Date: Tue Nov 8 14:43:38 2011 +0100
Commit inicial
gitk o GitX
master
![Page 33: Presentacion git](https://reader038.fdocument.pub/reader038/viewer/2022102805/5557ac35d8b42a696c8b4a8d/html5/thumbnails/33.jpg)
echo "como va todo" >> saludo
master Commit inicial
Cambios sin commitear
![Page 34: Presentacion git](https://reader038.fdocument.pub/reader038/viewer/2022102805/5557ac35d8b42a696c8b4a8d/html5/thumbnails/34.jpg)
echo "como va todo" >> saludo
master Commit inicial
Cambios sin commitear
git add saludogit commit -m "Amplio saludo"
master
Commit inicial
Amplio saludo
![Page 35: Presentacion git](https://reader038.fdocument.pub/reader038/viewer/2022102805/5557ac35d8b42a696c8b4a8d/html5/thumbnails/35.jpg)
echo "como va todo" >> saludo
master Commit inicial
Cambios sin commitear
git commit -a -m "Amplio saludo"
master
Commit inicial
Amplio saludo
![Page 36: Presentacion git](https://reader038.fdocument.pub/reader038/viewer/2022102805/5557ac35d8b42a696c8b4a8d/html5/thumbnails/36.jpg)
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
![Page 37: Presentacion git](https://reader038.fdocument.pub/reader038/viewer/2022102805/5557ac35d8b42a696c8b4a8d/html5/thumbnails/37.jpg)
master
![Page 38: Presentacion git](https://reader038.fdocument.pub/reader038/viewer/2022102805/5557ac35d8b42a696c8b4a8d/html5/thumbnails/38.jpg)
master
Commit inicial ( df5839d78e7... )
Amplio saludo
![Page 39: Presentacion git](https://reader038.fdocument.pub/reader038/viewer/2022102805/5557ac35d8b42a696c8b4a8d/html5/thumbnails/39.jpg)
master
Commit inicial ( df5839d78e7... )
Amplio saludo
git checkout df5839
master
Commit inicial
Amplio saludo
![Page 40: Presentacion git](https://reader038.fdocument.pub/reader038/viewer/2022102805/5557ac35d8b42a696c8b4a8d/html5/thumbnails/40.jpg)
master
Commit inicial ( df5839d78e7... )
Amplio saludo
git checkout df5839
master
Commit inicial
Amplio saludo
git checkout master
master
Commit inicial ( df5839d78e7... )
![Page 41: Presentacion git](https://reader038.fdocument.pub/reader038/viewer/2022102805/5557ac35d8b42a696c8b4a8d/html5/thumbnails/41.jpg)
![Page 42: Presentacion git](https://reader038.fdocument.pub/reader038/viewer/2022102805/5557ac35d8b42a696c8b4a8d/html5/thumbnails/42.jpg)
Alicia Github
master
masterremotes/origin/
git remote add origin git://github.com/user/repo.git
![Page 43: Presentacion git](https://reader038.fdocument.pub/reader038/viewer/2022102805/5557ac35d8b42a696c8b4a8d/html5/thumbnails/43.jpg)
Alicia Github
master
masterremotes/origin/masterremotes/origin/
git fetch origin
![Page 44: Presentacion git](https://reader038.fdocument.pub/reader038/viewer/2022102805/5557ac35d8b42a696c8b4a8d/html5/thumbnails/44.jpg)
Alicia Github
git merge origin/master
masterremotes/origin/master masterremotes/origin/
git fetch origin
![Page 45: Presentacion git](https://reader038.fdocument.pub/reader038/viewer/2022102805/5557ac35d8b42a696c8b4a8d/html5/thumbnails/45.jpg)
Alicia Github
git merge origin/master
masterremotes/origin/master masterremotes/origin/
git fetch origin }git pull origin master
![Page 46: Presentacion git](https://reader038.fdocument.pub/reader038/viewer/2022102805/5557ac35d8b42a696c8b4a8d/html5/thumbnails/46.jpg)
Alicia Github
master
masterremotes/origin/masterremotes/origin/masterremotes/origin/masterremotes/origin/
![Page 47: Presentacion git](https://reader038.fdocument.pub/reader038/viewer/2022102805/5557ac35d8b42a696c8b4a8d/html5/thumbnails/47.jpg)
Alicia Github
git push origin master
masterremotes/origin/master masterremotes/origin/
![Page 48: Presentacion git](https://reader038.fdocument.pub/reader038/viewer/2022102805/5557ac35d8b42a696c8b4a8d/html5/thumbnails/48.jpg)
svn update git pull
svn add archivo git add archivo
svn update -r git checkout
svn commit -mgit commit -a -mgit push
![Page 49: Presentacion git](https://reader038.fdocument.pub/reader038/viewer/2022102805/5557ac35d8b42a696c8b4a8d/html5/thumbnails/49.jpg)
Ramas
![Page 50: Presentacion git](https://reader038.fdocument.pub/reader038/viewer/2022102805/5557ac35d8b42a696c8b4a8d/html5/thumbnails/50.jpg)
git checkout -b facebook
master facebook
![Page 51: Presentacion git](https://reader038.fdocument.pub/reader038/viewer/2022102805/5557ac35d8b42a696c8b4a8d/html5/thumbnails/51.jpg)
master
2 commits más tarde...
![Page 52: Presentacion git](https://reader038.fdocument.pub/reader038/viewer/2022102805/5557ac35d8b42a696c8b4a8d/html5/thumbnails/52.jpg)
master
git checkout master
![Page 53: Presentacion git](https://reader038.fdocument.pub/reader038/viewer/2022102805/5557ac35d8b42a696c8b4a8d/html5/thumbnails/53.jpg)
git checkout mastergit merge facebook
master facebook
![Page 54: Presentacion git](https://reader038.fdocument.pub/reader038/viewer/2022102805/5557ac35d8b42a696c8b4a8d/html5/thumbnails/54.jpg)
git merge facebookgit checkout master
master
git branch -d facebook
![Page 55: Presentacion git](https://reader038.fdocument.pub/reader038/viewer/2022102805/5557ac35d8b42a696c8b4a8d/html5/thumbnails/55.jpg)
master
![Page 56: Presentacion git](https://reader038.fdocument.pub/reader038/viewer/2022102805/5557ac35d8b42a696c8b4a8d/html5/thumbnails/56.jpg)
master
![Page 57: Presentacion git](https://reader038.fdocument.pub/reader038/viewer/2022102805/5557ac35d8b42a696c8b4a8d/html5/thumbnails/57.jpg)
master
git checkout master
![Page 58: Presentacion git](https://reader038.fdocument.pub/reader038/viewer/2022102805/5557ac35d8b42a696c8b4a8d/html5/thumbnails/58.jpg)
master
arreglamos bug en master (y hacemos commit)
![Page 59: Presentacion git](https://reader038.fdocument.pub/reader038/viewer/2022102805/5557ac35d8b42a696c8b4a8d/html5/thumbnails/59.jpg)
master
git checkout facebook
![Page 60: Presentacion git](https://reader038.fdocument.pub/reader038/viewer/2022102805/5557ac35d8b42a696c8b4a8d/html5/thumbnails/60.jpg)
master facebook
git merge master
![Page 61: Presentacion git](https://reader038.fdocument.pub/reader038/viewer/2022102805/5557ac35d8b42a696c8b4a8d/html5/thumbnails/61.jpg)
master
![Page 62: Presentacion git](https://reader038.fdocument.pub/reader038/viewer/2022102805/5557ac35d8b42a696c8b4a8d/html5/thumbnails/62.jpg)
master
git rebase master
![Page 63: Presentacion git](https://reader038.fdocument.pub/reader038/viewer/2022102805/5557ac35d8b42a696c8b4a8d/html5/thumbnails/63.jpg)
meld
![Page 64: Presentacion git](https://reader038.fdocument.pub/reader038/viewer/2022102805/5557ac35d8b42a696c8b4a8d/html5/thumbnails/64.jpg)
En el tintero...
git rm <fichero>git mv <fichero> <destino>git reset d5f64567 [--hard]git tag version-1.0 d5f64567git cherry-pickgit submodule
![Page 65: Presentacion git](https://reader038.fdocument.pub/reader038/viewer/2022102805/5557ac35d8b42a696c8b4a8d/html5/thumbnails/65.jpg)
Symfony2 ♥ Git
![Page 66: Presentacion git](https://reader038.fdocument.pub/reader038/viewer/2022102805/5557ac35d8b42a696c8b4a8d/html5/thumbnails/66.jpg)
bin/vendors
deps deps.lock
![Page 67: Presentacion git](https://reader038.fdocument.pub/reader038/viewer/2022102805/5557ac35d8b42a696c8b4a8d/html5/thumbnails/67.jpg)
[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 {
![Page 68: Presentacion git](https://reader038.fdocument.pub/reader038/viewer/2022102805/5557ac35d8b42a696c8b4a8d/html5/thumbnails/68.jpg)
Github
![Page 69: Presentacion git](https://reader038.fdocument.pub/reader038/viewer/2022102805/5557ac35d8b42a696c8b4a8d/html5/thumbnails/69.jpg)
![Page 70: Presentacion git](https://reader038.fdocument.pub/reader038/viewer/2022102805/5557ac35d8b42a696c8b4a8d/html5/thumbnails/70.jpg)
![Page 71: Presentacion git](https://reader038.fdocument.pub/reader038/viewer/2022102805/5557ac35d8b42a696c8b4a8d/html5/thumbnails/71.jpg)
![Page 72: Presentacion git](https://reader038.fdocument.pub/reader038/viewer/2022102805/5557ac35d8b42a696c8b4a8d/html5/thumbnails/72.jpg)
![Page 73: Presentacion git](https://reader038.fdocument.pub/reader038/viewer/2022102805/5557ac35d8b42a696c8b4a8d/html5/thumbnails/73.jpg)
![Page 74: Presentacion git](https://reader038.fdocument.pub/reader038/viewer/2022102805/5557ac35d8b42a696c8b4a8d/html5/thumbnails/74.jpg)
![Page 75: Presentacion git](https://reader038.fdocument.pub/reader038/viewer/2022102805/5557ac35d8b42a696c8b4a8d/html5/thumbnails/75.jpg)
![Page 76: Presentacion git](https://reader038.fdocument.pub/reader038/viewer/2022102805/5557ac35d8b42a696c8b4a8d/html5/thumbnails/76.jpg)
![Page 77: Presentacion git](https://reader038.fdocument.pub/reader038/viewer/2022102805/5557ac35d8b42a696c8b4a8d/html5/thumbnails/77.jpg)
![Page 78: Presentacion git](https://reader038.fdocument.pub/reader038/viewer/2022102805/5557ac35d8b42a696c8b4a8d/html5/thumbnails/78.jpg)
Repo
MiRepo
Fork!
Work
MiRepo'
Repo'Pull request
![Page 79: Presentacion git](https://reader038.fdocument.pub/reader038/viewer/2022102805/5557ac35d8b42a696c8b4a8d/html5/thumbnails/79.jpg)
![Page 80: Presentacion git](https://reader038.fdocument.pub/reader038/viewer/2022102805/5557ac35d8b42a696c8b4a8d/html5/thumbnails/80.jpg)
![Page 81: Presentacion git](https://reader038.fdocument.pub/reader038/viewer/2022102805/5557ac35d8b42a696c8b4a8d/html5/thumbnails/81.jpg)
PARA QUÉ?¿
http://www.flickr.com/photos/deadwords/2473829859/
![Page 82: Presentacion git](https://reader038.fdocument.pub/reader038/viewer/2022102805/5557ac35d8b42a696c8b4a8d/html5/thumbnails/82.jpg)
Preguntas?¿