introduzione a git - webinar zend
Post on 08-May-2015
1.153 Views
Preview:
DESCRIPTION
TRANSCRIPT
Tuesday, June 26, 2012
Tuesday, June 26, 2012
perché git?✤ branching
✤ velocità
✤ offline
✤ branching === flessibilità
✤ GitHub
Tuesday, June 26, 2012
prima release 7 agosto 2005
Tuesday, June 26, 2012
1,740,288 utenti
3,067,552 repository
Tuesday, June 26, 2012
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
git clone
Tuesday, June 26, 2012
git clone
scaricare il codice da un repository
Tuesday, June 26, 2012
git clone
Tuesday, June 26, 2012
la working copy è anch’essa un repository!
git clone
Tuesday, June 26, 2012
la working copy è anch’essa un repository!
git clone
Tuesday, June 26, 2012
git init
inizializzazione di un repository git
Tuesday, June 26, 2012
inizializzazione di un repository git
git init
Tuesday, June 26, 2012
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
aggiunta di contenuto
git status
Tuesday, June 26, 2012
aggiunta di contenuto
git status
Tuesday, June 26, 2012
aggiunta di contenuto
git status
Tuesday, June 26, 2012
aggiunta di contenuto
git add
Tuesday, June 26, 2012
aggiunta di contenuto
git add
Tuesday, June 26, 2012
aggiunta di contenuto
staging area
Tuesday, June 26, 2012
aggiunta di contenuto
staging area
Tuesday, June 26, 2012
staging area
Tuesday, June 26, 2012
git commit
Tuesday, June 26, 2012
git config --global color.ui auto
Tuesday, June 26, 2012
Tuesday, June 26, 2012
script shell prompt stato repo
es: https://github.com/robbyrussell/oh-my-zsh/
Tuesday, June 26, 2012
git commit
Tuesday, June 26, 2012
# commit
filesystem checksum
Tuesday, June 26, 2012
nuova modifica + nuovo file
Tuesday, June 26, 2012
nuova modifica + nuovo file
Tuesday, June 26, 2012
Tuesday, June 26, 2012
Tuesday, June 26, 2012
branch
master : default branch
Tuesday, June 26, 2012
branch
master : default branch
Tuesday, June 26, 2012
branch
master : default branch
Tuesday, June 26, 2012
git branch <name>
creazione nuovo branch
Tuesday, June 26, 2012
branch login
Tuesday, June 26, 2012
branch login altre 2 commit
git log --pretty=oneline
Tuesday, June 26, 2012
git config --global alias.slog 'log --pretty=oneline'
Tuesday, June 26, 2012
master branch rimane invariato
Tuesday, June 26, 2012
master branch rimane invariato
Tuesday, June 26, 2012
modifico master branch
Tuesday, June 26, 2012
git merge
integro le modifiche del branch login con il branch master
Tuesday, June 26, 2012
git graph log
Tuesday, June 26, 2012
git config --global alias.glog
‘log --graph --pretty=oneline --abbrev-commit’
Tuesday, June 26, 2012
git merge
login
master
Tuesday, June 26, 2012
git merge
master
login
non fast-forward
Tuesday, June 26, 2012
git merge
non fast-forward
Tuesday, June 26, 2012
git reset
Tuesday, June 26, 2012
git reset
Tuesday, June 26, 2012
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
git merge
fast-forward
Tuesday, June 26, 2012
git merge
fast-forward
Tuesday, June 26, 2012
git merge
fast-forward
Tuesday, June 26, 2012
git merge
fast-forward
Tuesday, June 26, 2012
git reflog
Tuesday, June 26, 2012
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
git rebase
Tuesday, June 26, 2012
git rebase
conflitto!
Tuesday, June 26, 2012
git rebasepresente su master
presente su login
Tuesday, June 26, 2012
git rebase
teniamo entrambe le modifiche
Tuesday, June 26, 2012
git rebase
Tuesday, June 26, 2012
git rebase
Fast Forward!
Tuesday, June 26, 2012
git rebase
Fast Forward!
Tuesday, June 26, 2012
git rebase
master
login
Tuesday, June 26, 2012
git rebase
login
master
Tuesday, June 26, 2012
git rebase
login
master
Tuesday, June 26, 2012
repository remoti
Tuesday, June 26, 2012
repository remoti
copio il mio repository locale in remoto, origin
Tuesday, June 26, 2012
Tuesday, June 26, 2012
git push
sincronizzo il mio repository locale con quello remoto
Tuesday, June 26, 2012
school.ideato.it/contatti
Corso GIT per sviluppatori (e non solo)
20 luglio31 agosto13 settembre
Sedi del corso:MilanoRomaBresciaCesena
Tuesday, June 26, 2012
Grazie!
@cirpoac@ideato.it
Tuesday, June 26, 2012
http://git-scm.com/book
http://git-scm.com/
risorse
Tuesday, June 26, 2012
top related