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
53
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
32
Featured
See All Featured
Making the Leap to Tech Lead
cromwellryan
133
9.1k
Rails Girls Zürich Keynote
gr2m
94
13k
Building an army of robots
kneath
302
45k
Being A Developer After 40
akosma
89
590k
The Cult of Friendly URLs
andyhume
78
6.2k
The Myth of the Modular Monolith - Day 2 Keynote - Rails World 2024
eileencodes
20
2.4k
Building Your Own Lightsaber
phodgson
104
6.2k
Mobile First: as difficult as doing things right
swwweet
223
9.3k
Build The Right Thing And Hit Your Dates
maggiecrowley
34
2.5k
Testing 201, or: Great Expectations
jmmastey
41
7.2k
Fashionably flexible responsive web design (full day workshop)
malarkey
406
66k
Reflections from 52 weeks, 52 projects
jeffersonlam
348
20k
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