Introduzione a GIT - Webinar Zend
-
Upload
alessandro-cinelli -
Category
Technology
-
view
1.144 -
download
0
description
Transcript of Introduzione a GIT - Webinar Zend
![Page 1: Introduzione a GIT - Webinar Zend](https://reader033.fdocuments.in/reader033/viewer/2022052618/554bb171b4c905b8618b5a64/html5/thumbnails/1.jpg)
Tuesday, June 26, 2012
![Page 2: Introduzione a GIT - Webinar Zend](https://reader033.fdocuments.in/reader033/viewer/2022052618/554bb171b4c905b8618b5a64/html5/thumbnails/2.jpg)
Tuesday, June 26, 2012
![Page 3: Introduzione a GIT - Webinar Zend](https://reader033.fdocuments.in/reader033/viewer/2022052618/554bb171b4c905b8618b5a64/html5/thumbnails/3.jpg)
perché git?✤ branching
✤ velocità
✤ offline
✤ branching === flessibilità
✤ GitHub
Tuesday, June 26, 2012
![Page 4: Introduzione a GIT - Webinar Zend](https://reader033.fdocuments.in/reader033/viewer/2022052618/554bb171b4c905b8618b5a64/html5/thumbnails/4.jpg)
prima release 7 agosto 2005
Tuesday, June 26, 2012
![Page 5: Introduzione a GIT - Webinar Zend](https://reader033.fdocuments.in/reader033/viewer/2022052618/554bb171b4c905b8618b5a64/html5/thumbnails/5.jpg)
1,740,288 utenti
3,067,552 repository
Tuesday, June 26, 2012
![Page 6: Introduzione a GIT - Webinar Zend](https://reader033.fdocuments.in/reader033/viewer/2022052618/554bb171b4c905b8618b5a64/html5/thumbnails/6.jpg)
https://github.com/php
https://github.com/zendframework
https://github.com/symfony
https://github.com/WordPress
https://github.com/jquery
e tanti altri...
Tuesday, June 26, 2012
![Page 7: Introduzione a GIT - Webinar Zend](https://reader033.fdocuments.in/reader033/viewer/2022052618/554bb171b4c905b8618b5a64/html5/thumbnails/7.jpg)
git clone
Tuesday, June 26, 2012
![Page 8: Introduzione a GIT - Webinar Zend](https://reader033.fdocuments.in/reader033/viewer/2022052618/554bb171b4c905b8618b5a64/html5/thumbnails/8.jpg)
git clone
scaricare il codice da un repository
Tuesday, June 26, 2012
![Page 9: Introduzione a GIT - Webinar Zend](https://reader033.fdocuments.in/reader033/viewer/2022052618/554bb171b4c905b8618b5a64/html5/thumbnails/9.jpg)
git clone
Tuesday, June 26, 2012
![Page 10: Introduzione a GIT - Webinar Zend](https://reader033.fdocuments.in/reader033/viewer/2022052618/554bb171b4c905b8618b5a64/html5/thumbnails/10.jpg)
la working copy è anch’essa un repository!
git clone
Tuesday, June 26, 2012
![Page 11: Introduzione a GIT - Webinar Zend](https://reader033.fdocuments.in/reader033/viewer/2022052618/554bb171b4c905b8618b5a64/html5/thumbnails/11.jpg)
la working copy è anch’essa un repository!
git clone
Tuesday, June 26, 2012
![Page 12: Introduzione a GIT - Webinar Zend](https://reader033.fdocuments.in/reader033/viewer/2022052618/554bb171b4c905b8618b5a64/html5/thumbnails/12.jpg)
git init
inizializzazione di un repository git
Tuesday, June 26, 2012
![Page 13: Introduzione a GIT - Webinar Zend](https://reader033.fdocuments.in/reader033/viewer/2022052618/554bb171b4c905b8618b5a64/html5/thumbnails/13.jpg)
inizializzazione di un repository git
git init
Tuesday, June 26, 2012
![Page 14: Introduzione a GIT - Webinar Zend](https://reader033.fdocuments.in/reader033/viewer/2022052618/554bb171b4c905b8618b5a64/html5/thumbnails/14.jpg)
contenuto della directory .git
git init.git|-- HEAD|-- branches|-- config|-- description|-- hooks| |-- applypatch-msg.sample| |-- commit-msg.sample| |-- post-commit.sample| |-- post-receive.sample| |-- post-update.sample| |-- pre-applypatch.sample| |-- pre-commit.sample| |-- pre-rebase.sample| |-- prepare-commit-msg.sample| `-- update.sample|-- info| `-- exclude|-- objects| |-- info| `-- pack`-- refs |-- heads `-- tags
9 directories, 14 files
Tuesday, June 26, 2012
![Page 15: Introduzione a GIT - Webinar Zend](https://reader033.fdocuments.in/reader033/viewer/2022052618/554bb171b4c905b8618b5a64/html5/thumbnails/15.jpg)
aggiunta di contenuto
git status
Tuesday, June 26, 2012
![Page 16: Introduzione a GIT - Webinar Zend](https://reader033.fdocuments.in/reader033/viewer/2022052618/554bb171b4c905b8618b5a64/html5/thumbnails/16.jpg)
aggiunta di contenuto
git status
Tuesday, June 26, 2012
![Page 17: Introduzione a GIT - Webinar Zend](https://reader033.fdocuments.in/reader033/viewer/2022052618/554bb171b4c905b8618b5a64/html5/thumbnails/17.jpg)
aggiunta di contenuto
git status
Tuesday, June 26, 2012
![Page 18: Introduzione a GIT - Webinar Zend](https://reader033.fdocuments.in/reader033/viewer/2022052618/554bb171b4c905b8618b5a64/html5/thumbnails/18.jpg)
aggiunta di contenuto
git add
Tuesday, June 26, 2012
![Page 19: Introduzione a GIT - Webinar Zend](https://reader033.fdocuments.in/reader033/viewer/2022052618/554bb171b4c905b8618b5a64/html5/thumbnails/19.jpg)
aggiunta di contenuto
git add
Tuesday, June 26, 2012
![Page 20: Introduzione a GIT - Webinar Zend](https://reader033.fdocuments.in/reader033/viewer/2022052618/554bb171b4c905b8618b5a64/html5/thumbnails/20.jpg)
aggiunta di contenuto
staging area
Tuesday, June 26, 2012
![Page 21: Introduzione a GIT - Webinar Zend](https://reader033.fdocuments.in/reader033/viewer/2022052618/554bb171b4c905b8618b5a64/html5/thumbnails/21.jpg)
aggiunta di contenuto
staging area
Tuesday, June 26, 2012
![Page 22: Introduzione a GIT - Webinar Zend](https://reader033.fdocuments.in/reader033/viewer/2022052618/554bb171b4c905b8618b5a64/html5/thumbnails/22.jpg)
staging area
Tuesday, June 26, 2012
![Page 23: Introduzione a GIT - Webinar Zend](https://reader033.fdocuments.in/reader033/viewer/2022052618/554bb171b4c905b8618b5a64/html5/thumbnails/23.jpg)
git commit
Tuesday, June 26, 2012
![Page 24: Introduzione a GIT - Webinar Zend](https://reader033.fdocuments.in/reader033/viewer/2022052618/554bb171b4c905b8618b5a64/html5/thumbnails/24.jpg)
git config --global color.ui auto
Tuesday, June 26, 2012
![Page 25: Introduzione a GIT - Webinar Zend](https://reader033.fdocuments.in/reader033/viewer/2022052618/554bb171b4c905b8618b5a64/html5/thumbnails/25.jpg)
Tuesday, June 26, 2012
![Page 26: Introduzione a GIT - Webinar Zend](https://reader033.fdocuments.in/reader033/viewer/2022052618/554bb171b4c905b8618b5a64/html5/thumbnails/26.jpg)
script shell prompt stato repo
es: https://github.com/robbyrussell/oh-my-zsh/
Tuesday, June 26, 2012
![Page 27: Introduzione a GIT - Webinar Zend](https://reader033.fdocuments.in/reader033/viewer/2022052618/554bb171b4c905b8618b5a64/html5/thumbnails/27.jpg)
git commit
Tuesday, June 26, 2012
![Page 28: Introduzione a GIT - Webinar Zend](https://reader033.fdocuments.in/reader033/viewer/2022052618/554bb171b4c905b8618b5a64/html5/thumbnails/28.jpg)
# commit
filesystem checksum
Tuesday, June 26, 2012
![Page 29: Introduzione a GIT - Webinar Zend](https://reader033.fdocuments.in/reader033/viewer/2022052618/554bb171b4c905b8618b5a64/html5/thumbnails/29.jpg)
nuova modifica + nuovo file
Tuesday, June 26, 2012
![Page 30: Introduzione a GIT - Webinar Zend](https://reader033.fdocuments.in/reader033/viewer/2022052618/554bb171b4c905b8618b5a64/html5/thumbnails/30.jpg)
nuova modifica + nuovo file
Tuesday, June 26, 2012
![Page 31: Introduzione a GIT - Webinar Zend](https://reader033.fdocuments.in/reader033/viewer/2022052618/554bb171b4c905b8618b5a64/html5/thumbnails/31.jpg)
Tuesday, June 26, 2012
![Page 32: Introduzione a GIT - Webinar Zend](https://reader033.fdocuments.in/reader033/viewer/2022052618/554bb171b4c905b8618b5a64/html5/thumbnails/32.jpg)
Tuesday, June 26, 2012
![Page 33: Introduzione a GIT - Webinar Zend](https://reader033.fdocuments.in/reader033/viewer/2022052618/554bb171b4c905b8618b5a64/html5/thumbnails/33.jpg)
branch
master : default branch
Tuesday, June 26, 2012
![Page 34: Introduzione a GIT - Webinar Zend](https://reader033.fdocuments.in/reader033/viewer/2022052618/554bb171b4c905b8618b5a64/html5/thumbnails/34.jpg)
branch
master : default branch
Tuesday, June 26, 2012
![Page 35: Introduzione a GIT - Webinar Zend](https://reader033.fdocuments.in/reader033/viewer/2022052618/554bb171b4c905b8618b5a64/html5/thumbnails/35.jpg)
branch
master : default branch
Tuesday, June 26, 2012
![Page 36: Introduzione a GIT - Webinar Zend](https://reader033.fdocuments.in/reader033/viewer/2022052618/554bb171b4c905b8618b5a64/html5/thumbnails/36.jpg)
git branch <name>
creazione nuovo branch
Tuesday, June 26, 2012
![Page 37: Introduzione a GIT - Webinar Zend](https://reader033.fdocuments.in/reader033/viewer/2022052618/554bb171b4c905b8618b5a64/html5/thumbnails/37.jpg)
branch login
Tuesday, June 26, 2012
![Page 38: Introduzione a GIT - Webinar Zend](https://reader033.fdocuments.in/reader033/viewer/2022052618/554bb171b4c905b8618b5a64/html5/thumbnails/38.jpg)
branch login altre 2 commit
git log --pretty=oneline
Tuesday, June 26, 2012
![Page 39: Introduzione a GIT - Webinar Zend](https://reader033.fdocuments.in/reader033/viewer/2022052618/554bb171b4c905b8618b5a64/html5/thumbnails/39.jpg)
git config --global alias.slog 'log --pretty=oneline'
Tuesday, June 26, 2012
![Page 40: Introduzione a GIT - Webinar Zend](https://reader033.fdocuments.in/reader033/viewer/2022052618/554bb171b4c905b8618b5a64/html5/thumbnails/40.jpg)
master branch rimane invariato
Tuesday, June 26, 2012
![Page 41: Introduzione a GIT - Webinar Zend](https://reader033.fdocuments.in/reader033/viewer/2022052618/554bb171b4c905b8618b5a64/html5/thumbnails/41.jpg)
master branch rimane invariato
Tuesday, June 26, 2012
![Page 42: Introduzione a GIT - Webinar Zend](https://reader033.fdocuments.in/reader033/viewer/2022052618/554bb171b4c905b8618b5a64/html5/thumbnails/42.jpg)
modifico master branch
Tuesday, June 26, 2012
![Page 43: Introduzione a GIT - Webinar Zend](https://reader033.fdocuments.in/reader033/viewer/2022052618/554bb171b4c905b8618b5a64/html5/thumbnails/43.jpg)
git merge
integro le modifiche del branch login con il branch master
Tuesday, June 26, 2012
![Page 44: Introduzione a GIT - Webinar Zend](https://reader033.fdocuments.in/reader033/viewer/2022052618/554bb171b4c905b8618b5a64/html5/thumbnails/44.jpg)
git graph log
Tuesday, June 26, 2012
![Page 45: Introduzione a GIT - Webinar Zend](https://reader033.fdocuments.in/reader033/viewer/2022052618/554bb171b4c905b8618b5a64/html5/thumbnails/45.jpg)
git config --global alias.glog
‘log --graph --pretty=oneline --abbrev-commit’
Tuesday, June 26, 2012
![Page 46: Introduzione a GIT - Webinar Zend](https://reader033.fdocuments.in/reader033/viewer/2022052618/554bb171b4c905b8618b5a64/html5/thumbnails/46.jpg)
git merge
login
master
Tuesday, June 26, 2012
![Page 47: Introduzione a GIT - Webinar Zend](https://reader033.fdocuments.in/reader033/viewer/2022052618/554bb171b4c905b8618b5a64/html5/thumbnails/47.jpg)
git merge
master
login
non fast-forward
Tuesday, June 26, 2012
![Page 48: Introduzione a GIT - Webinar Zend](https://reader033.fdocuments.in/reader033/viewer/2022052618/554bb171b4c905b8618b5a64/html5/thumbnails/48.jpg)
git merge
non fast-forward
Tuesday, June 26, 2012
![Page 49: Introduzione a GIT - Webinar Zend](https://reader033.fdocuments.in/reader033/viewer/2022052618/554bb171b4c905b8618b5a64/html5/thumbnails/49.jpg)
git reset
Tuesday, June 26, 2012
![Page 50: Introduzione a GIT - Webinar Zend](https://reader033.fdocuments.in/reader033/viewer/2022052618/554bb171b4c905b8618b5a64/html5/thumbnails/50.jpg)
git reset
Tuesday, June 26, 2012
![Page 51: Introduzione a GIT - Webinar Zend](https://reader033.fdocuments.in/reader033/viewer/2022052618/554bb171b4c905b8618b5a64/html5/thumbnails/51.jpg)
git reset<versione>
1) sposta HEAD alla versione (si ferma se si specifica l’opzione --soft)
2) poi, sposta la index alla versione (si ferma almeno che si specifichi l’opzione --hard)
3) poi, sposta la working copy alla versione specificata
Tuesday, June 26, 2012
![Page 52: Introduzione a GIT - Webinar Zend](https://reader033.fdocuments.in/reader033/viewer/2022052618/554bb171b4c905b8618b5a64/html5/thumbnails/52.jpg)
git merge
fast-forward
Tuesday, June 26, 2012
![Page 53: Introduzione a GIT - Webinar Zend](https://reader033.fdocuments.in/reader033/viewer/2022052618/554bb171b4c905b8618b5a64/html5/thumbnails/53.jpg)
git merge
fast-forward
Tuesday, June 26, 2012
![Page 54: Introduzione a GIT - Webinar Zend](https://reader033.fdocuments.in/reader033/viewer/2022052618/554bb171b4c905b8618b5a64/html5/thumbnails/54.jpg)
git merge
fast-forward
Tuesday, June 26, 2012
![Page 55: Introduzione a GIT - Webinar Zend](https://reader033.fdocuments.in/reader033/viewer/2022052618/554bb171b4c905b8618b5a64/html5/thumbnails/55.jpg)
git merge
fast-forward
Tuesday, June 26, 2012
![Page 56: Introduzione a GIT - Webinar Zend](https://reader033.fdocuments.in/reader033/viewer/2022052618/554bb171b4c905b8618b5a64/html5/thumbnails/56.jpg)
git reflog
Tuesday, June 26, 2012
![Page 57: Introduzione a GIT - Webinar Zend](https://reader033.fdocuments.in/reader033/viewer/2022052618/554bb171b4c905b8618b5a64/html5/thumbnails/57.jpg)
git rebase
torniamo al punto in cui abbiamo fatto modifiche sia sul branch master, sia sul branch login
MAnon abbiamo ancora fatto il merge (facendolo avremmo un nuovo commit -> no fast forward)
Tuesday, June 26, 2012
![Page 58: Introduzione a GIT - Webinar Zend](https://reader033.fdocuments.in/reader033/viewer/2022052618/554bb171b4c905b8618b5a64/html5/thumbnails/58.jpg)
git rebase
Tuesday, June 26, 2012
![Page 59: Introduzione a GIT - Webinar Zend](https://reader033.fdocuments.in/reader033/viewer/2022052618/554bb171b4c905b8618b5a64/html5/thumbnails/59.jpg)
git rebase
conflitto!
Tuesday, June 26, 2012
![Page 60: Introduzione a GIT - Webinar Zend](https://reader033.fdocuments.in/reader033/viewer/2022052618/554bb171b4c905b8618b5a64/html5/thumbnails/60.jpg)
git rebasepresente su master
presente su login
Tuesday, June 26, 2012
![Page 61: Introduzione a GIT - Webinar Zend](https://reader033.fdocuments.in/reader033/viewer/2022052618/554bb171b4c905b8618b5a64/html5/thumbnails/61.jpg)
git rebase
teniamo entrambe le modifiche
Tuesday, June 26, 2012
![Page 62: Introduzione a GIT - Webinar Zend](https://reader033.fdocuments.in/reader033/viewer/2022052618/554bb171b4c905b8618b5a64/html5/thumbnails/62.jpg)
git rebase
Tuesday, June 26, 2012
![Page 63: Introduzione a GIT - Webinar Zend](https://reader033.fdocuments.in/reader033/viewer/2022052618/554bb171b4c905b8618b5a64/html5/thumbnails/63.jpg)
git rebase
Fast Forward!
Tuesday, June 26, 2012
![Page 64: Introduzione a GIT - Webinar Zend](https://reader033.fdocuments.in/reader033/viewer/2022052618/554bb171b4c905b8618b5a64/html5/thumbnails/64.jpg)
git rebase
Fast Forward!
Tuesday, June 26, 2012
![Page 65: Introduzione a GIT - Webinar Zend](https://reader033.fdocuments.in/reader033/viewer/2022052618/554bb171b4c905b8618b5a64/html5/thumbnails/65.jpg)
git rebase
master
login
Tuesday, June 26, 2012
![Page 66: Introduzione a GIT - Webinar Zend](https://reader033.fdocuments.in/reader033/viewer/2022052618/554bb171b4c905b8618b5a64/html5/thumbnails/66.jpg)
git rebase
login
master
Tuesday, June 26, 2012
![Page 67: Introduzione a GIT - Webinar Zend](https://reader033.fdocuments.in/reader033/viewer/2022052618/554bb171b4c905b8618b5a64/html5/thumbnails/67.jpg)
git rebase
login
master
Tuesday, June 26, 2012
![Page 68: Introduzione a GIT - Webinar Zend](https://reader033.fdocuments.in/reader033/viewer/2022052618/554bb171b4c905b8618b5a64/html5/thumbnails/68.jpg)
repository remoti
Tuesday, June 26, 2012
![Page 69: Introduzione a GIT - Webinar Zend](https://reader033.fdocuments.in/reader033/viewer/2022052618/554bb171b4c905b8618b5a64/html5/thumbnails/69.jpg)
repository remoti
copio il mio repository locale in remoto, origin
Tuesday, June 26, 2012
![Page 70: Introduzione a GIT - Webinar Zend](https://reader033.fdocuments.in/reader033/viewer/2022052618/554bb171b4c905b8618b5a64/html5/thumbnails/70.jpg)
Tuesday, June 26, 2012
![Page 71: Introduzione a GIT - Webinar Zend](https://reader033.fdocuments.in/reader033/viewer/2022052618/554bb171b4c905b8618b5a64/html5/thumbnails/71.jpg)
git push
sincronizzo il mio repository locale con quello remoto
Tuesday, June 26, 2012
![Page 72: Introduzione a GIT - Webinar Zend](https://reader033.fdocuments.in/reader033/viewer/2022052618/554bb171b4c905b8618b5a64/html5/thumbnails/72.jpg)
school.ideato.it/contatti
Corso GIT per sviluppatori (e non solo)
20 luglio31 agosto13 settembre
Sedi del corso:MilanoRomaBresciaCesena
Tuesday, June 26, 2012
![Page 74: Introduzione a GIT - Webinar Zend](https://reader033.fdocuments.in/reader033/viewer/2022052618/554bb171b4c905b8618b5a64/html5/thumbnails/74.jpg)
http://git-scm.com/book
http://git-scm.com/
risorse
Tuesday, June 26, 2012