Git session day 1
- 1. GIT Ready introduction to git and github
- 2. Day 1
- 3. Who am I ? ● Mosaab Ehab elsayed ● 3rd year student at faculty of engineering ● CSED ● python Web developer with django ● web circle member at CATReloaded ● marketer at IEEEMansB ● good learner seek to be the teacher
- 4. Sad Story ….
- 11. Version control
- 12. also known as revision control or source control, is the management of changes to documents, computer programs, large web sites, and other collections of information. https://goo.gl/e43hnH
- 14. Version control systems are a category of software tools that help a software team manage changes to source code over time. Version control software keeps track of every modification to the code in a special kind of database. https://goo.gl/xEkRsa
- 21. Any Editor use offline manual saving Manual Saving yes yes yes Dropbox yes no no
- 22. Any Editor use offline manual saving Manual Saving yes yes yes Dropbox yes no no Google Docs no no no
- 23. Any Editor use offline manual saving Manual Saving yes yes yes Dropbox yes no no Google Docs no no no Wikipedia no no yes
- 24. Version control Systems ● CVS ● SVN ● Mercurial (hg) ● Git
- 25. GIT
- 26. a version control system for tracking changes in computer files and coordinating work on those files among multiple people. It is primarily used for source code management in software development,but it can be used to keep track of changes in any set of files https://goo.gl/xEkRsa
- 27. Any Editor use offline manual saving Manual Saving yes yes yes Dropbox yes no no Google Docs no no no Wikipedia no no yes Git yes yes yes
- 28. Installing Git
- 30. Windows
- 31. Ubuntu $ sudo apt-get update $ sudo apt-get install git
- 33. Username and Email $ git config --global user.name “your name” $ git config --global user.email “your email”
- 34. Commits
- 36. commit with multiple files index.html
- 37. commit with multiple files index.html game.js
- 38. commit with multiple files index.html game.js main.css
- 39. commit with multiple files index.html game.js main.css index.html
- 40. commit with multiple files index.html game.js main.css index.html index.html
- 41. commit with multiple files index.html game.js main.css index.html index.html index.html
- 42. commit with multiple files index.html game.js main.css index.html index.html index.html game.js main.css game.js main.css game.js main.css
- 43. commit with multiple files index.html game.js main.css index.html index.html index.html game.js main.css game.js main.css game.js main.css commit
- 44. What makes a repo a repo ?
- 47. GUI Vs Command line
- 52. Initialize your first repo ...
- 54. git commit -m “add my first commit”
- 55. our first commit $ git add “file name” $ git commit -m “your message”
- 56. Staging area
- 61. index.html game.js main.css Working directory Staging Area index.html game.js main.css Repository Commit Commit Commit
- 62. index.html game.js main.css Working directory index.html Staging Area index.html game.js main.css Repository Commit Commit Commit git add “file”
- 65. index.html game.js main.css Working directory index.html game.js main.css Staging Area index.html game.js main.css Repository Commit Commit Commit git add “file” git commit
- 67. Display commits $ git log $ git log --pretty=oneline
- 68. Step back
- 69. Step back $ git reset --hard or $ git checkout <commit_id>
- 70. git reset Discard any changes in either the working directory or the staging area
- 71. index.html game.js main.css Working directory index.html game.js main.css Staging Area index.html game.js main.css Repository Commit Commit Commit git reset --hard
- 73. commit: . author : .. parent : .. size: ….
- 74. commit: . author : .. parent : .. size: …. commit: . author : .. parent : .. size: ….
- 75. commit: . author : .. parent : .. size: …. commit: . author : .. parent : .. size: …. commit: . author : .. parent : .. size: ….
- 76. commit: . author : .. parent : .. size: …. commit: . author : .. parent : .. size: …. commit: . author : .. parent : .. size: …. commit: . author : .. parent : .. size: ….
- 77. commit: , author : .. parent : .. size: …. commit: . author : .. parent : .. size: …. commit: . author : .. parent : .. size: …. commit: , author : .. parent : .. size: …. commit: . author : .. parent : .. size: ….
- 78. commit: . author : .. parent : .. size: …. commit: . author : .. parent : .. size: …. commit: . author : .. parent : .. size: …. commit: . author : .. parent : .. size: …. commit: . author : .. parent : .. size: …. commit: . author : .. parent : .. size: ….
- 79. commit: . author : .. parent : .. size: …. commit: . author : .. parent : .. size: …. commit: . author : .. parent : .. size: …. commit: . author : .. parent : .. size: …. commit: , author : .. parent : .. size: …. commit: . author : .. parent : .. size: …. commit: . author : .. parent : .. size: ….
- 80. commit: . author : .. parent : .. size: …. commit: . author : .. parent : .. size: …. commit: . author : .. parent : .. size: …. commit: . author : .. parent : .. size: …. commit: , author : .. parent : .. size: …. commit: . author : .. parent : .. size: …. commit: . author : .. parent : .. size: …. commit: . author : .. parent : .. size: ….
- 81. commit: . author : .. parent : .. size: …. commit: . author : .. parent : .. size: …. commit: . author : .. parent : .. size: …. commit: . author : .. parent : .. size: …. commit: , author : .. parent : .. size: …. commit: . author : .. parent : .. size: …. commit: . author : .. parent : .. size: …. commit: . author : .. parent : .. size: …. commit: . author : .. parent : .. size: ….
- 82. commit: . author : .. parent : .. size: …. commit: . author : .. parent : .. size: …. commit: . author : .. parent : .. size: …. commit: . author : .. parent : .. size: …. commit: , author : .. parent : .. size: …. commit: . author : .. parent : .. size: …. commit: . author : .. parent : .. size: …. commit: . author : .. parent : .. size: …. commit: . author : .. parent : .. size: …. Master
- 83. Branching $ git branch <branch_name>
- 84. move to the new branch $ git checkout <branch_name>
- 85. two steps in one $ git branch <branch_name> + $ git checkout <branch_name> = $ git checkout -b <branch_name>
- 86. display your paths $ git log --graph --oneline <branch_name> <another_branch>
- 88. display your paths $ git merge <branch_name> <other_branch> $ git commit -m “merge branches”
- 89. delete branch $ git branch -d <branch_name>
- 90. solve the conflicts between branches
- 92. Show your diffs
- 93. show your difs $ git diff $ git diff <id1> <id2> $ git diff --staged
- 96. index.html game.js main.css Working directory index.html game.js main.css Staging Area index.html game.js main.css Repository Commit Commit Commit git diff git diff <id> <id>
- 97. index.html game.js main.css Working directory index.html game.js main.css Staging Area index.html game.js main.css Repository Commit Commit Commit git diff git diff --staged git diff <id> <id>
- 98. Git some help
- 99. Git some help $ git help $ git help <aspect>
- 100. Any questions ?
- 101. Thank you :”)
- 102. see you soon :”D