Git for Beginners
1 like677 views
The document is a presentation on using Git, aimed at beginners in a Drupal camp. It covers foundational concepts such as creating a repository, adding and committing code, reviewing changes, tagging versions, and collaborating via GitHub. The presentation also offers a practical homework exercise on merging branches.
Git for Beginners
- 1. Git for Beginners New England Drupal Camp November 1, 2014 Rick Umali @rickumali http://tech.rickumali.com/ Slides!
- 2. Me and You ● Me ○ VIC-20 ○ Boston ○ Data Janitor ○ Git ● You?
- 3. Book! Nov 1, 2014: drupalcftw (44% off) thru November 2014 One Day Special: Nov 2, 2014: dotd110214au (50% off) 44% Off! http://www.manning.com/umali
- 6. Git Git is an open source, distributed version control system designed for speed and efficiency. Freedom No “server” required Unique architecture
- 7. What We Will Do
- 8. Step 1. Create Repo % cd sites/all/modules % mkdir dumpstamp % cd dumpstamp % git init Git is a circle
- 9. Step 2. Add Code % vi README.txt % git add README.txt % git commit -m “First commit.” Two step process: add then commit
- 10. Step 3. Review % git log % gitk % git status
- 11. Repeat 2 and 3 % vi dumpstamp.info dumpstamp.module % git status % git add . % git status % git commit (or git citool) % git diff
- 12. Tagging a Version % git tag -a v1.0 % git tag -l -n % git show v1.0 v1.0 annotated Bookmarks
- 13. Repeat 2 and 3 % vi dumpstamp.module % git status % git add . % git status % git diff % git commit v1.0
- 14. Go Back in Time % git checkout v1.0 % git checkout master v1.0 Detached HEAD
- 15. Fork in the Road (Branch) % git checkout -b time_stamp v1.0 OR % git checkout v1.0 % git branch time_stamp % git checkout time_stamp v1.0 We’ve been working on a branch all along!
- 16. Add Code to New Branch % git branch % vi dumpstamp.module % git status % git diff % git commit -a v1.0 Separate lines of code/development
- 17. Everything we’ve done so far was local… Let’s now bring others in our work
- 18. Collaborating you bob mary
- 19. Collaborating via GitHub GitHub mary bob you 1 2 3
- 20. Creating a Repo on GitHub https://help.github.com/articles/create-a-repo/
- 21. Initial Push to GitHub % git remote add origin git@github.com:rickumali/REPO.git % git push -u origin --all % git push --tags you GitHub
- 22. Clone and Pull % git clone git@github.com:rickumali/REPO.git % cd mary % git branch --all GitHub mary Git is a circle
- 23. Collaborating via GitHub mary GitHub you git pull git push git push git pull
- 24. Git for Beginners Thank You! Rick Umali @rickumali http://tech.rickumali.com/
- 25. Homework: Merging % git checkout master % git merge time_stamp v1.0