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
Intergalactic Javascript Robots from Outer Space
tanoku
270
27k
Side Projects
sachag
452
42k
Practical Tips for Bootstrapping Information Extraction Pipelines
honnibal
PRO
12
950
Code Reviewing Like a Champion
maltzj
521
39k
Done Done
chrislema
182
16k
Mobile First: as difficult as doing things right
swwweet
223
9.3k
StorybookのUI Testing Handbookを読んだ
zakiyama
28
5.5k
What’s in a name? Adding method to the madness
productmarketing
PRO
22
3.3k
CoffeeScript is Beautiful & I Never Want to Write Plain JavaScript Again
sstephenson
160
15k
Put a Button on it: Removing Barriers to Going Fast.
kastner
60
3.7k
Building Adaptive Systems
keathley
40
2.4k
Why Our Code Smells
bkeepers
PRO
335
57k
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