Upgrade to Pro
— share decks privately, control downloads, hide ads and more …
Speaker Deck
Features
Speaker Deck
PRO
Sign in
Sign up for free
Search
Search
Git Basics
Search
Awin Abi
February 25, 2015
0
71
Git Basics
Awin Abi
February 25, 2015
Tweet
Share
More Decks by Awin Abi
See All by Awin Abi
Building and Launching your MVP
awin
0
57
Featured
See All Featured
Statistics for Hackers
jakevdp
799
220k
Building Flexible Design Systems
yeseniaperezcruz
329
39k
Rails Girls Zürich Keynote
gr2m
95
14k
Creating an realtime collaboration tool: Agile Flush - .NET Oxford
marcduiker
34
2.3k
A Modern Web Designer's Workflow
chriscoyier
697
190k
Responsive Adventures: Dirty Tricks From The Dark Corners of Front-End
smashingmag
253
22k
The Art of Delivering Value - GDevCon NA Keynote
reverentgeek
16
1.7k
Producing Creativity
orderedlist
PRO
347
40k
Testing 201, or: Great Expectations
jmmastey
45
7.7k
A Tale of Four Properties
chriscoyier
161
23k
Become a Pro
speakerdeck
PRO
29
5.6k
Done Done
chrislema
185
16k
Transcript
Git Basics
Setup & Config Create a public repo in Github
Install git in local apt-get install git ssh setup https://help.github.com/articles/generating-ssh-ke ys/ Add global config for git in local git config --global user.name "Awin Abi" git config --global user.email
[email protected]
Daily Git Clone git clone <repo> Add changes
git add <file> Status git status Commit git commit Log git log Push git push origin master Pull git pull origin master
Some Concepts
Branching & Merging A branch is a movable pointer
to one of these commits New Branch git checkout -b <branchname> Switch Branch git checkout <branchname> Merge git checkout master git merge <branch>
None
None
Pull Request Create a new branch from master for
a new ticket '33452/fix-approver-view' Make changes and commit Push the new branch to github Create pull request Comment / Review Merge Pull Request https://guides.github.com/introduction/flow/
Git Session II Simple merge Merge with conflicts
Rebase Meld and Netbeans Git
Notes Download Git plugin for Netbeans 6.9:: https://code.google.com/p/nbgit/downloads/detail?name=nbgit-0.4- netbeans-6.9.nbm&can=2&q=0.4
Install meld tool:: sudo apt-get install meld Configure meld as diff and merge tool:: git config --global diff.external meld git config --global merge.tool meld
Questions
Thank You