introducere git

17
INTRODUCERE GIT Instalare https://git-scm.com/donloads ! T rebuie sa selectati sistemul de operare iar pentru windows isi da seama singur si descarca fsierul corect 

Upload: ana-constantinescu

Post on 05-Mar-2016

263 views

Category:

Documents


0 download

DESCRIPTION

Un mic ajutor pentru comenzile din git

TRANSCRIPT

Page 1: Introducere GIT

7/21/2019 Introducere GIT

http://slidepdf.com/reader/full/introducere-git 1/23

INTRODUCEREGIT

Page 2: Introducere GIT

7/21/2019 Introducere GIT

http://slidepdf.com/reader/full/introducere-git 2/23

Instalare

■ https://git-scm.com/donloads

! Trebuie sa selectati sistemul de operare iar pentru windowseama singur si descarca fsierul corect 

Page 3: Introducere GIT

7/21/2019 Introducere GIT

http://slidepdf.com/reader/full/introducere-git 3/23

Getting started

■ Creati "older pe Des#top de pre"erinta

■ Deschideti GIT C$D

logo git indos logo git

Page 4: Introducere GIT

7/21/2019 Introducere GIT

http://slidepdf.com/reader/full/introducere-git 4/23

%a ce "oloseste GIT si c&m sel&crea'a■ (entr& a tine e)identa de')oltarii &n&i proiect

■ Un proiect are mai m&lte ram&ri *+ranch,

! Ramura “Master” 

■ (e ea se constr&ieste proiect&l

■ &ng n&mai modicarile nale

! Ramuri de dezvoltare

Page 5: Introducere GIT

7/21/2019 Introducere GIT

http://slidepdf.com/reader/full/introducere-git 5/23

Des"as&rare ram&ri proiect

Page 6: Introducere GIT

7/21/2019 Introducere GIT

http://slidepdf.com/reader/full/introducere-git 6/23

NE0ER E0ER E0ER E0ER n&l&crati in master daca n& 0ET

(ER$I1IUNE e2plicita de a l&in master

■ In general o sa a)eti &n +ranch desemnat al )ostr&

Page 7: Introducere GIT

7/21/2019 Introducere GIT

http://slidepdf.com/reader/full/introducere-git 7/23

1patii de l&cr&

■ E2ista 3 spatii de l&cr&

! Working copy 

! Staging area

! Repository 

Page 8: Introducere GIT

7/21/2019 Introducere GIT

http://slidepdf.com/reader/full/introducere-git 8/23

4or#ing cop5

■ 1pati&l 'ic de pe comp&ter&l )ostr&

■ 1&nt sierele c& care l&crati )oi direct

■ $odicarile pe care le "aceti n& apar si nici n& in6&entea'a pr

Page 9: Introducere GIT

7/21/2019 Introducere GIT

http://slidepdf.com/reader/full/introducere-git 9/23

1taging area

■ 7isierele care s&nt pregatite sa e ada&gate in proiect

■ NU s&nt inca parte din proiect

! La rulare nu sunt luate in considerare

■ 0a arata )o&a starea sierelor pe care le a)eti in e)identa

Page 10: Introducere GIT

7/21/2019 Introducere GIT

http://slidepdf.com/reader/full/introducere-git 10/23

Repositor5

■  Toate sierele care se a6a in repositor5 "ac parte din proiect

■ Daca &n sier n& merge

! roiectul sau partea de proiect pe care o in!uenteaza fsiemerge

Page 11: Introducere GIT

7/21/2019 Introducere GIT

http://slidepdf.com/reader/full/introducere-git 11/23

Getting started

■ 1crieti in linia de comanda:

! cd "esktop

! cd nume#$older 

■ In moment&l acesta nea6am in "older&l in care )a

proiect&l■ (entr& a crea proiect in git

scriem in linia de comanda

! git init

Page 12: Introducere GIT

7/21/2019 Introducere GIT

http://slidepdf.com/reader/full/introducere-git 12/23

Creare +ranch

■ In ca'&l in care s&nteti parte a &n&i proiect mai mare )eti l&cr&n&l sa& mai m&lte +ranch-&ri ale )oastre

■ Creare +ranch:

! git branc% nume#branc%

■ (entr& a te m&ta in no&l +ranch:

! git c%eckout nume#branc%

■ 7olositi n&me clare pentr& +ranch-&ri

Page 13: Introducere GIT

7/21/2019 Introducere GIT

http://slidepdf.com/reader/full/introducere-git 13/23

da&gare sier in 1taging re

■ In moment&l in care am terminat de e"ect&at modicari &n&i s&ntem pregatiti sa il ada&gam in proiect

! git add nume#fsier 

Page 14: Introducere GIT

7/21/2019 Introducere GIT

http://slidepdf.com/reader/full/introducere-git 14/23

da&gare siere in Repositor5

■ D&pa ce am &rcat in staging area toate sierele la care am e"emodicari8 s&ntem pregatiti sa le ada&gam in proiect

! git commit &m “Mesa' relevant” 

■ 7&nctia commit )a l&at TOTE sierele din staging area si le adproiect

■ $esa&l pe care il ada&gam d&pa 9!m este 7ORTE I$(ORTN! (e a'uta sa ne dam seama ce fsiere am adaugat) ce mod

am $acut etc*

!  +sa putem tine evidenta commit,urilor pentru cazul in carsa ne intoarcem la o versiune anterioara

Page 15: Introducere GIT

7/21/2019 Introducere GIT

http://slidepdf.com/reader/full/introducere-git 15/23

E)identa commit-&ri

■ (entr& a )edea toate commit-&rile:

! git log

! git log ,,aut%or “(ume” 

■ (rim&l rand: Cod&l &nic al commit-&l&i

■ Rand&l doi: &tor&l commit&l&i

■ Rand&l trei: Data la care s-a "ac&t commit-&l

■ Rand&l patr&: $esa&l

Page 16: Introducere GIT

7/21/2019 Introducere GIT

http://slidepdf.com/reader/full/introducere-git 16/23

1coate sier din staging area

■ In ca'&l in care am ada&gat &n sier in staging area din grese

! git reset -.+" nume#fsier 

Page 17: Introducere GIT

7/21/2019 Introducere GIT

http://slidepdf.com/reader/full/introducere-git 17/23

1tat&s siere

■ Ne arata care siere s&nt ada&gate in staging area8 si sierele&rma commit-&l&i n& o sa e ada&gate

! git status

■ 7isierele trec&te c& )erde s&nt

  sierele care s&nt l&ate in e)identa8

  sierele trec&te c& ros& s&nt siere

  nel&ate in e)identa8 care in &rma

commit-&l&i n& o sa e ada&gate

Page 18: Introducere GIT

7/21/2019 Introducere GIT

http://slidepdf.com/reader/full/introducere-git 18/23

Di"erente apar&te in sier

■ (entr& a )edea ce rand&ri a& "ost noi ada&gate si ce rand&ri asterse:

! git di/ 

! git di/ ,,staged 00 pentru fsierele adaugate in staging ar

■ Rand&rile c& al+ s&nt nemodicare

■ Rand&rile c& ros& s&nt rand&ri sterse■ Rand&rile c& )erde s&nt rand&ri no& ada&gate

Page 19: Introducere GIT

7/21/2019 Introducere GIT

http://slidepdf.com/reader/full/introducere-git 19/23

1tergere sier

■ Daca )rem sa eliminam &n sier din proiect

! git rm nume#fsier 

■ Comanda )a sterge si sier&l 'ic din "older

■ (entr& a a)ea e;ect in proiect tre+&ie dat si &n commit

Page 20: Introducere GIT

7/21/2019 Introducere GIT

http://slidepdf.com/reader/full/introducere-git 20/23

Reden&mire sier

■ Daca dorim sa schim+am n&mele &n&i sier:

! git mv nume#vec%i nume#nou

■ ceasi comanda o p&tem "olosi si pentr& a m&ta sier&l in alt

! git mv nume#fsier nume#$older#nou0nume#fsier 

Page 21: Introducere GIT

7/21/2019 Introducere GIT

http://slidepdf.com/reader/full/introducere-git 21/23

Inloc&ire sier c& )ariante2istenta intr-&n commit ante■ Daca am sters &n sier8 sa& am modicat &n sier ast"el intat

stim de la ce am pornit

■ Daca )rem sa re)enim la o stare anterioara a sier&l&i

! git c%eckout ,, nume#fsier 00 ultima versiune a fsireului

! git c%eckout numar#commit ,, nume#fsier 00 versiune dint

anumit commit 

Page 22: Introducere GIT

7/21/2019 Introducere GIT

http://slidepdf.com/reader/full/introducere-git 22/23