Hands on with Version Control System: GIT (Part 2)

This deck helps you to understand how to manage multiple branches, how to create a branch and merge & how to manage remote repositories.

Transcript

2. Keep practicing GIT
3. Quick Recap
4. The 3 states • Modified • Staged • Committed
5. File status lifecycle
6. Configuration Identity $git config --global user.name “Dhrumil Shah” $git config --global user.email “dhuma1981@gmail.com” $git config --global user.email “dhuma1981@gmail.com”
7. Creating a repository $git init
8. Creating a repository $git clone URL E.g. https://github.com/dhuma1981/WearableDemo
9. Add new file $git add readme.txt
10. Remove file From staging area $git rm --cached test.txt From index and file system From index and file system $git rm test.txt
11. Commit changes $git commit $git commit –m “First” $git commit –am “Second”
12. Show status $git status
13. Show log Entire $git log Date Filtering Date Filtering $git log --since=2.weeks $git log --since=“2 years 1 day 3 minutes ago”
14. Show difference Unstagged changes $git diff Staged changes $git diff --cached $git diff --cached Relative to specific revision $git diff 17765f $git diff HEAD^
15. Show commits Last commit $git show Specific commit Specific commit $git show 17765f $git show HEAD^
16. Add remote repositories $git remote add origin <GIT URL> e.g. $git remote add origin https://github.com/dhuma1981/GDGAhmedabad_HOWGIT.git
17. Push to remote repository $git push –u origin master
18. Cloning a remote repository $git clone <URL> e.g. $git clone https://github.com/dhuma1981/GDGAhmedabad_HOWGIT.git
19. Pull from remote repository $git pull
20. Git Branching
21. Branches are “Pointers” to commits
22. Branches can diverge
23. Branches can be merged
24. Create new branch $git branch <branch_name> e.g. $git branch tester
25. Switching branch Switch to already created branch $git checkout tester Create new branch and switch to it Create new branch and switch to it $git checkout -b developer
26. Show all branches All branches $git branch $git branch -v Merged branches Merged branches $git branch --merged Unmerged branches $git branch –no-merged
27. Merge branches $git merge <branch_name> e.g. $git merge tester
28. Successful merge
29. Congratulations
30. GITHUB