Downloaded 27 times
Uploaded byEdureka!
Hacking Git and GitHub
This document provides an overview of using Git and GitHub. It demonstrates how to initialize a Git repository, stage and commit changes, create a remote GitHub repository, and push code to it. It also covers creating branches and merging them, using .gitignore files, and undoing staged changes. The goal is to teach best practices for version control of code and collaborating via GitHub repositories.
Hacking Git and GitHub
- 1.
- 2. www.edureka.co/git-github What will youlearn today? Creating GitHub repository Pushing code to remote GitHub repository Unstaging files Using alias and gitignore file Creating new branches and merging them back to master branch
- 3. www.edureka.co/git-github Initializing a GitRepository index.html
- 4. www.edureka.co/git-github Staging and CommittingChanges Staging changes Committing changes
- 5. www.edureka.co/git-github Creating a remoteGitHub Repository To push the committed changes, you need to create a repository on GitHub. To create a GitHub repository go to https://github.com/ and create a new repository, by clicking on New repository link
- 6. www.edureka.co/git-github Creating a remoteGitHub Repository GitHub Repository
- 7. www.edureka.co/git-github Pushing to GitHubRepository Once GitHub repository is created copy the repository link and push the code as shown below Note that master is the default branch which is created automatically when we create a GitHub repository
- 8. www.edureka.co/git-github Changes on GitHubrepository After pushing changes to GitHub repository, all the committed code can be seen on GitHub. Its always a good idea to put a README file in all the GitHub repo which explains about repository
- 9. www.edureka.co/git-github Adding a READMEfile You can see the complete syntax for markdown here https://help.github.com/articles/markdown-basics/ README.md
- 10. www.edureka.co/git-github Staging and Committingthe README file Staging README.md Committing README.md
- 11. www.edureka.co/git-github Pushing README changesto GitHub Pushing changes
- 12. www.edureka.co/git-github GitHub repo afteradding README file After adding READMe.md file Live repository will look like as shown below, which explains about the repo
- 13. www.edureka.co/git-github Creating a remotehandle Previously we pushed the changes to remote repository using the URL of the repository. Rather than typing the URL each time or copying and pasting the URL, we can create a short handle for that as shown below Creating a remote handle Pushing changes to GitHub repository Note that master is the default branch which is created automatically when we create a GitHub repository
- 14. www.edureka.co/git-github Adding new file Addednew file data.txt git status shows, there is one file data.txt which is untracked by Git
- 15. www.edureka.co/git-github Staging and Committingin one command We can stage and commit changes in one command by combining git add and git commit, as shown below Note that we have used && operator to combine both add and commit command
- 16. www.edureka.co/git-github Staging multiple files Butwhat If I added 5 new files, can I commit all the files with one single command ?
- 17. www.edureka.co/git-github Adding new files Herewe have added 5 new files (file1.html, file2.html and so on). git status shows that 5 files are untracked
- 18. www.edureka.co/git-github Staging multiple files Wecan stage all the untracked files using –A option with git add as shown below Staging multiple files with git add -A
- 19. www.edureka.co/git-github Creating Alias Staging andcommitting is very frequent operation while working with Git, its always a good option to create a short alias for long Git commands that you have to type frequently Above we have created alias add-commit for add and commit git commands
- 20. www.edureka.co/git-github Removing some filesfrom Commit Its always a good practice to commit only those files to GitHub repository that are required. So if you are having a Java project you should remove .class files and any other file that have sensitive information e.g. username/password etc.
- 21. www.edureka.co/git-github Creating .gitignore file .gitignorefile is used to specify which files to exclude from commit. Here we have excluded all the files that are under .settings and build directory
- 22. www.edureka.co/git-github Committing and Pushingthe changes Committing the changes Pushing the changes
- 23. www.edureka.co/git-github Verifying the changes Notethat both build and .settings directories are not pushed on GitHub, as we included them in .gitignore file
- 24. www.edureka.co/git-github Unstaging a file Considerthe scenario where you have two files meetup-session.py and exercise.py You accidentally put both the files in staging area but you only want to commit meetup-session.py Problem : Solution : We can unstage the exercise.py by using git rm --cached <file>
- 25.
- 26. www.edureka.co/git-github Unstaging a file Belowwe have unstaged exercise.py file
- 27.
- 28. www.edureka.co/git-github Why Branching ? Supposeyou want to add/update courses.html file to add new features but you don’t want to mess the original courses.html file. So what you will do ?
- 29. www.edureka.co/git-github Why Branching ? Youwill copy courses.html file and rename it to something else (in this case courses2.html). Once you are satisfied with your changes in courses2.html, you will delete courses.html file and rename courses2.html to courses.html. This tedious workflow can easily be solved by Git
- 30. www.edureka.co/git-github Initializing the directoryas Git repository
- 31. www.edureka.co/git-github Committing all thechanges After committing all the changes Now you want to add new feature to the project without messing with the current working code. Lets see how to achieve this efficiently with Git branching
- 32. www.edureka.co/git-github Creating a newbranch and switching to it Creating new branch newFeature from master branch Switching to new branch newFeature from master branch
- 33. www.edureka.co/git-github Making changes innew branch courses.html Just for demo purpose lets add a title tag and h1 header tag to courses.html, while we are working in newFeature branch
- 34. www.edureka.co/git-github Unstaged changes innew branch courses.html after adding title and h1 tag
- 35. www.edureka.co/git-github Unstaged changes innew branch Lets add a new file about.html while we are on newFeature branch So we have modified courses.html and added a new file about.html while we are working on newFeature branch
- 36. www.edureka.co/git-github Magic of Branches Stagingand committing the changes in the new branch Changes made in newFeature branch will only be visible in newFeature branch not in master branch
- 37. www.edureka.co/git-github Magic of Branches Whenwe switch to master branch, about.html will not be present as shown below, because those changes were made in newFeature branch and not in master branch. To combine those changes in master branch we will have to merge newFeature branch in master branch
- 38. www.edureka.co/git-github Merging Branches To mergenewFeature branch into master, first checkout to master branch and use the command git merge newFeature, as shown below After merging, about.html and any other changes made in newFeature branch will be reflected in master branch as shown below
- 39. www.edureka.co/git-github Survey Your feedback isvital for us, be it a compliment, a suggestion or a complaint. It helps us to make your experience better! Please spare few minutes to take the survey after the webinar.
- 40. www.edureka.co/git-github Thank You … Questions/Queries/Feedback Recordingand presentation will be made available to you within 24 hours