Git Amalamulira Woyesa Aliyense Ayenera Kudziwa

Uthengawu ndi Git Cheat Sheet yokhala ndi malamulo odziwika kwambiri a Git omwe mungagwiritse ntchito tsiku ndi tsiku.

Ngati ndinu woyesa ukadaulo wogwira ntchito limodzi ndi omwe akutukula, muyenera kudziwa malamulo oyambira a Git.

Izi ndizomwe zili ndi chidziwitso chokwanira cha Git kuti zikuyendetseni tsiku ndi tsiku ngati QA.


Ngati simunakhazikitse Git pamakina anu, mutha kutsatira izi Momwe Mungayikitsire Git pa Mac ndikupanga ma Keys a SSH .



Kukhazikitsa Kwa Git Koyamba

Yambitsani repo

Pangani git repo yopanda kanthu kapena yambitsaninso yomwe ilipo kale


$ git init

Yambani repo

Pangani foo repo mu chikwatu chatsopano chotchedwa foo:

$ git clone https://github.com//foo.git foo

Git Nthambi

Momwe Mungapangire Nthambi Yatsopano ku Git

Mukafuna kugwira ntchito yatsopano, mumapanga nthambi yatsopano ku Git. Mwakutero, nthawi zambiri mumafuna kuchoka pa nthambi yayikulu ndikugwirira ntchito nthambi zanu kuti mbuye wawo azikhala oyera nthawi zonse ndipo mutha kupanga nthambi zatsopano kuchokera pamenepo.

Kupanga kugwiritsa ntchito nthambi yatsopano:

$ git checkout -b

Momwe Mungalembere Nthambi mu Git

Ngati mukufuna kudziwa nthambi zomwe zikupezeka patsamba lanu logwiritsa ntchito, gwiritsani ntchito:


$ git branch

Kutulutsa kwachitsanzo:

develop my_feature master

Momwe Mungasinthire Nthambi ku Git

Mukakhazikitsa nthambi yatsopano ndiye kuti Git imasinthira ku nthambi yatsopanoyo.

Ngati muli ndi nthambi zingapo, mutha kusintha mosavuta pakati pa nthambi ndi git checkout:

$ git checkout master $ git checkout develop $ git checkout my_feature

Momwe Mungachotsere Nthambi mu Git

Kuchotsa nthambi yakomweko:


$ git branch -d

Gwiritsani ntchito -D mbendera yoti mukakamize.

Kuchotsa nthambi yakutali pa Chiyambi:

$ git push origin :

Zokhudzana:

  • Momwe mungakhalire git ndikupanga ma SSH Keys pa Mac


Gawo la Git

Kuti siteji fayilo ndikungokonzekera kudzipereka. Mukamawonjezera kapena kusintha mafayilo ena, muyenera kuyika zosinthazo 'm'deralo.' Ganizirani zokhala ngati bokosi momwe mumayika zinthu musanaponye pansi pa kama, pomwe bedi lanu ndi chosungira mabokosi omwe mudaponyamo kale.


Mafayilo a Git Stage

Kuti muyambe kapena kuwonjezera mafayilo, muyenera kugwiritsa ntchito git add command. Mutha kupanga mafayilo amtundu uliwonse:

$ git add foo.js

kapena mafayilo onse nthawi imodzi:

$ git add .

Kusintha Kwa Git Unstage

Ngati mukufuna kuchotsa fayilo ina pabwalo:

$ git reset HEAD foo.js

Kapena chotsani mafayilo onse:


$ git reset HEAD .

Muthanso kupanga zolemba pamalamulo kenako ndikuzigwiritsa ntchito ndi Git:

$ git config --global alias.unstage 'reset HEAD' $ git unstage .

Mkhalidwe wa Git

Ngati mukufuna kuwona mafayilo omwe apangidwa, kusinthidwa kapena kuchotsedwa, mawonekedwe a Git akuwonetsani lipoti.

$ git status

Kudzipereka

Ndi mchitidwe wabwino kuchita nthawi zambiri. Nthawi zonse mumatha kuphwanya zomwe mwachita musanakankhidwe. Musanachite kusintha kwanu, muyenera kuziyika.

Lamulo lodzipereka limafuna chisankho cha -m chomwe chimafotokoza uthenga wopereka.

Mutha kusintha zosintha zanu monga:

$ git commit -m 'Updated README'

Kubwezeretsa Kudzipereka

Lamulo lotsatirali lithetsa zomwe mwachita posachedwa ndikubwezeretsanso kusintha, kuti musataye ntchito iliyonse:

$ git reset --soft HEAD~1

Kuchotsa kwathunthu kudzipereka ndi kutaya chilichonse chomwe chingagwiritsidwe ntchito:

$ git reset --hard HEAD~1

Kudzipereka

Tiyerekeze kuti mwachita 4, koma simunakakamize chilichonse ndipo mukufuna kuyika chilichonse pachimodzi, kenako mutha kugwiritsa ntchito:

$ git rebase -i HEAD~4

Zolemba HEAD~4 amatanthauza kuchita zinayi zomaliza.

Zolemba -i chisankho chimatsegula fayilo yolemba.

Mudzawona mawu oti 'sankhani' kumanzere kwazinthu zilizonse. Siyani imodzi pamwamba yokha ndikusintha ina yonse ndi 's' ya sikwashi, sungani ndikutseka fayilo.

Kenako zenera lina lotseguka limatsegulira pomwe mungasinthire mauthenga anu odzipereka kukhala uthenga watsopano.



Git Kankhani

Mukamaliza kusintha, chotsatira ndikukankhira kumalo osungira kutali.

Kankhani koyamba

Sakani nthambi yakomweko kwa nthawi yoyamba:

$ git push --set-upstream origin

Pambuyo pake, ndiye mutha kungogwiritsa ntchito

$ git push

Kankhirani nthambi yakwanuko ku nthambi yakutali

Kuti mukankhe nthambi yakomweko kupita kunthambi ina yakutali, mutha kugwiritsa ntchito:

$ git push origin :

Sinthani Kutsiriza Komaliza

Ngati mukuyenera kusintha kukankha kwanu komaliza, mutha kugwiritsa ntchito:

$ git reset --hard HEAD~1 && git push -f origin master

Kutenga Git

Mukagwiritsa ntchito git fetch, Git simaphatikiza ena amawachita ndi nthambi yanu yapano. Izi ndizothandiza makamaka ngati mukuyenera kusunga malo anu osungira, koma mukuchita china chake chomwe chingaswe ngati musintha mafayilo anu.

Kuphatikiza zomwe mwachita mu nthambi yanu yayikulu, mumagwiritsa ntchito merge.

Tengani zosintha kuchokera kumtunda

$ git fetch upstream

Kokani Git

Kukoka kumangotenga kenako kutsata kuphatikiza. Mukamagwiritsa ntchito git pull, Git imasokoneza zochitika zina popanda kukulolani kuti muwunikenso kaye. Ngati simusamala bwino nthambi zanu, mutha kukangana pafupipafupi.

Kokani nthambi

Ngati muli ndi nthambi yotchedwa my_feature ndipo mukufuna kukoka nthambiyi, mutha kugwiritsa ntchito:

$ git pull origin/my_feature

Kokani zonse

Kapena, ngati mukufuna kukoka zonse ndi nthambi zina zonse

$ git pull

Kuphatikiza kwa Git ndi Kubwezeretsanso

Mukamayendetsa git merge, nthambi yanu ya HEAD ipanga fayilo ya kudzipereka kwatsopano , kusunga makolo a mbiri iliyonse yopanga.

Pulogalamu ya kuwombera amalembanso kusintha kwa nthambi ina kupita kwina wopanda kupanga kudzipereka kwatsopano.

Gwirizanitsani Master Branch kuti Muphatikize Nthambi

$ git checkout my_feature $ git merge master

Kapena posankha njira yobwezera, mumagwiritsa ntchito:

$ git checkout my_feature $ git rebase master

Gwirizanitsani Nthambi Yogulitsa ku Master Branch

$ git checkout master $ git merge my_feature

Git Stash

Nthawi zina mumasintha pa nthambi, ndipo mukufuna kusinthana ndi nthambi ina, koma simukufuna kutaya zosintha zanu.

Mutha kuletsa kusintha kwanu. Umu ndi momwe mumakhalira stash mu Git:

$ git stash

Tsopano, ngati mukufuna kutsegula zosinthazo ndikuzibwezeretsanso pazomwe mukugwiritsa ntchito:

$ git stash pop