Basics of Git and Version Control

Post on 17-Jul-2015

46 views 0 download

Transcript of Basics of Git and Version Control

http://j.mp/gitsylhet

http://usman.it

http://VeganCuts.com

http://CreateAudience.com

http://GitHub.com/usmanhalalit

GitisaVersionControlandSourceCodeManagementSystem(VCSandSCM).

index.phpindex_old_old.phpindex_heera.phpindex_final.php

index_17_05_2012.phpindex_ajaira.php

index_mathhai_dhorai_felse.php

http://GitHub.comhttp://BitBucket.com

http://git-scm.com/downloads

GitHubforWindows/MacSourceTreeTower($)MoreDefaultCommandLineClient

http://git-scm.com/downloads/guis

GotoTerminalorMSDosPrompt:

Typeyourusernameandpasswordwhenprompted(forHTTPS)

gitclonehttps://github.com/usmanahalalit/php-workshop-sample.git

cdphp-workshop-sample

ls

LetspullagainelsewheresothatweIcandemonstratecollaboration.

Addafiletouchindex.php

Makechangestoindex.php<?php

echo'WelcometoPHPWorkshop';

Checkstatusgitstatus

Addthefilegitaddindex.php

Commitchangesgitcommit-a

Pushchanges(needsinternet)gitpushoriginmaster

Okay,switchtoourHeeradirectorycd../php-workshop-sample-heera

Seewedon'thavechangesinHeeradirectoryPullchanges(needsinternet)

gitpulloriginmaster

Changefile<?php

echo'HelloHeera';

Commitchanges,wedon'tneedgitaddnowgitcommit-am"Changedwithmyname"

Pushchangesgitpushoriginmaster

Editcommitmessagegitcommit--amend

Branchinggitcheckoutdevelop-bgitcheckoutmastergitmergedevelop

.gitignoreapp/config/local*.tmp

GitConfig,GitReset,GitStash,GitRebase,CherryPick,........

Ihighlyrecommendchecking

http://j.mp/gitsylhet