Esi sithuba sisiPhepha sokukopela seGit kunye nemiyalelo eqhelekileyo ye-Git onokuyisebenzisa yonke imihla.
Ukuba ungumvavanyi wezobuchwephesha osebenza kunye nabaphuhlisi, kuya kufuneka uqhelane nemiyalelo esisiseko yeGit.
Esi sithuba siqulathe ulwazi olwaneleyo lweGit ukuze uhambe usuku nosuku njengeQA.
Ukuba awuyifakanga i-Git efakwe kumatshini wakho, unokulandela amanyathelo Uyifaka njani iGit kwiMac kwaye uvelise iiSSH Keys .
Yenza i-git repo engenanto okanye uqalise kwakhona esele ikho
$ git init
Yenza i-foo repo kulawulo olutsha olubizwa ngokuba yi-foo:
$ git clone https://github.com//foo.git foo
Xa ufuna ukusebenza kwinto entsha, wenza isebe elitsha eGit. Kananjalo, ngokubanzi ufuna ukuhlala ngaphandle kwesebe eliyintloko kwaye usebenze kumacandelo akho ukuze inkosi ihlale icocekile kwaye unokwenza amasebe amatsha kuyo.
Ukwenza ukusetyenziswa kwesebe elitsha:
$ git checkout -b
Ukuba ufuna ukwazi ukuba ngawaphi amasebe akhoyo kulawulo lwakho olusebenzayo, sebenzisa:
$ git branch
Iziphumo zomzekelo:
develop my_feature master
Xa usenza isebe elitsha emva koko iGit itshintshela kwisebe elitsha ngokuzenzekelayo.
Ukuba unamasebe amaninzi, unokutshintsha ngokulula phakathi kwamasebe ngokuphuma kwe-git:
$ git checkout master $ git checkout develop $ git checkout my_feature
Ukucima isebe lendawo:
$ git branch -d
Sebenzisa -D
Iflegi yokukhetha ukuyinyanzela.
Ukucima isebe elikude kwimvelaphi:
$ git push origin :
Idibeneyo:
Ukuya iqonga ifayile kukuyilungiselela ukuzibophelela. Xa usongeza okanye uguqula ezinye iifayile, kuya kufuneka ulungelelanise olo tshintsho 'kwindawo yokuma.' Cinga ngokubeka njengebhokisi apho ubeka khona izinto ngaphambi kokuyityhala phantsi kwebhedi yakho, apho ibhedi yakho yindawo yokugcina iibhokisi okhe wangena kuzo ngaphambili.
Ukuya kwinqanaba okanye ukongeza iifayile, kuya kufuneka usebenzise git add command. Ungaqokelela iifayile ezizezinye:
$ git add foo.js
okanye zonke iifayile ngaxeshanye:
$ git add .
Ukuba ufuna ukususa ifayile ethile eqongeni:
$ git reset HEAD foo.js
Okanye susa zonke iifayile ezihleliweyo:
$ git reset HEAD .
Unokwenza i-alias yomyalelo kwaye uyisebenzise nge-Git:
$ git config --global alias.unstage 'reset HEAD' $ git unstage .
Ukuba ufuna ukubona ukuba zeziphi iifayile ezenziweyo, eziguqulweyo okanye ezicinyiweyo, imeko yeGit iya kukubonisa ingxelo.
$ git status
Yindlela elungileyo ukuzibophelela rhoqo. Ungasoloko ugaqa phantsi ukwenza kwakho ngaphambi kokutyhala. Ngaphambi kokuba wenze utshintsho lwakho, kufuneka ulubeke kwinqanaba.
Umyalelo wokuzibophelela ufuna -m ukhetho oluchaza umyalezo wokuzibophelela.
Ungazenza iinguqu zakho ezinje:
$ git commit -m 'Updated README'
Lo myalelo ulandelayo uya kulungisa ukuzibophelela kwakho kutshanje kwaye ubeke olo tshintsho kwisiteji, ukuze ungalahli nawuphi na umsebenzi:
$ git reset --soft HEAD~1
Ukucima ngokupheleleyo ukuzibophelela kunye nokulahla naluphi na utshintsho olusebenzayo:
$ git reset --hard HEAD~1
Masithi unezibophelelo ezi-4, kodwa awukatyhaleli kwanto okwangoku kwaye ufuna ukubeka yonke into kwisibophelelo esinye, emva koko ungasebenzisa:
$ git rebase -i HEAD~4
I HEAD~4
Ibhekisa kwizivumelwano ezine zokugqibela.
I -i
ukhetho luvula ifayile yokubhaliweyo.
Uya kulibona igama 'khetha' ngasekhohlo kwesithembiso ngasinye. Shiya enye ephezulu yodwa kwaye ubeke endaweni yazo zonke ezinye ngo “s” zomngqusho, gcina kwaye uvale ifayile.
Emva koko enye iwindow esebenzayo iyavula apho unokuhlaziya khona imiyalezo yakho yokuzibophelela kumyalezo omnye wokuzibophelela.
Emva kokuba uwenzile utshintsho lwakho, okulandelayo kukutyhala kwindawo ekude.
Cofa isebe lendawo okokuqala ngqa:
$ git push --set-upstream origin
Emva koko, emva koko unokusebenzisa
$ git push
Ukutyhala isebe lendawo liye kwelinye isebe elikude, ungasebenzisa:
$ git push origin :
Ukuba kuya kufuneka urhoxise ukutyhala kwakho kokugqibela, ungasebenzisa:
$ git reset --hard HEAD~1 && git push -f origin master
Xa usebenzisa git fetch
, iGit ayidibanisi nezinye izenze kunye nesebe lakho langoku. Oku kuluncedo ngakumbi ukuba ufuna ukugcina indawo yokugcina izinto ihlaziyiwe, kodwa usebenza kwinto enokuthi yaphule xa uhlaziya iifayile zakho.
Ukudibanisa izithembiso kwisebe lakho eliyintloko, usebenzisa merge
.
$ git fetch upstream
Ukutsala kukwenza ukulanda okulandelwe kukudityaniswa. Xa usebenzisa git pull
, iGit ngokuzenzekelayo idibanisa ezinye izinto ngaphandle kokukuvumela ukuba uzijonge kuqala. Ukuba awulawuli kakuhle amasebe akho, unokufumana ukungqubana rhoqo.
Ukuba une isebe elibizwa my_feature
kwaye ufuna ukutsala elo sebe, ungasebenzisa:
$ git pull origin/my_feature
Okanye, ukuba ufuna ukutsala yonke into kunye nawo onke amanye amasebe
$ git pull
Xa uqhuba git merge
, isebe lakho le-HEAD liya kuvelisa ukuzibophelela okutsha , Ukugcina izinyanya kwimbali nganye yokuzibophelela.
Inkqubo ye- ukugqithisa Ubhala kwakhona utshintsho kwelinye isebe uye kwelinye ngaphandle ukudala ukuzibophelela okutsha.
$ git checkout my_feature $ git merge master
Okanye ngokukhetha ukuphinda ukhethe, usebenzisa:
$ git checkout my_feature $ git rebase master
$ git checkout master $ git merge my_feature
Ngamanye amaxesha wenza utshintsho kwisebe, kwaye ufuna ukutshintshela kwelinye isebe, kodwa awufuni kuphulukana notshintsho lwakho.
Ungalubamba utshintsho lwakho. Nantsi indlela oyenza ngayo i-stash kwi-Git:
$ git stash
Ngoku, ukuba ufuna ukungalususi olo tshintsho kwaye ubabuyisele kulawulo lwakho olusebenzayo:
$ git stash pop