Git introduction
1 like588 views
The document provides an overview of Git, including version control concepts like distributed revision control and repositories. It discusses key Git commands for adding, committing, tracking changes to code, working with branches, pushing/pulling to remote repositories, tagging versions, and using submodules. The document also covers ranges and identifiers for commits, and other commands like revert, reset, stash, bisect, rebase, and gc.
Git introduction
- 1. Git Kornel Lugosi @Coornail May 17, 2011
- 2. Table of contents Version control Distributed revision control Repository Adding, commiting Tracking changes Branches Pushing, pulling Submodules Ranges and other identifications of hashes Other fun stuff Resources
- 3. Version control What?
- 4. Version control Why?
- 5. Version control Why? ◮ Backup
- 6. Version control Why? ◮ Backup ◮ Revision handling
- 7. Version control Why? ◮ Backup ◮ Revision handling ◮ Teamwork
- 8. Version control Why? ◮ Backup ◮ Revision handling ◮ Teamwork ◮ Organized code commit access and workflow
- 9. Version control Why? ◮ Backup ◮ Revision handling ◮ Teamwork ◮ Organized code commit access and workflow ◮ Deploying
- 10. Version control How?
- 11. Version control How? ◮ CVS
- 12. Version control How? ◮ CVS ◮ SVN
- 13. Version control How? ◮ CVS ◮ SVN ◮ Hg(Mercurial)
- 14. Version control How? ◮ CVS ◮ SVN ◮ Hg(Mercurial) ◮ bzr (Bazaar)
- 15. Version control How? ◮ CVS ◮ SVN ◮ Hg(Mercurial) ◮ bzr (Bazaar) ◮ ...
- 16. Version control How? ◮ CVS ◮ SVN ◮ Hg(Mercurial) ◮ bzr (Bazaar) ◮ ... ◮ Git
- 17. Distributed revision control
- 20. Repository $ git init $ git init --bare
- 21. Repository $ git init $ git init --bare $ git init --bare --shared=group
- 22. Let’s put some code in! $ echo "some code" > index.php $ git add index.php
- 23. Let’s put some code in! $ echo "some code" > index.php $ git add index.php Oh shit, it is only added to the “index“!
- 24. Let’s put some code in! $ echo "some code" > index.php $ git add index.php Oh shit, it is only added to the “index“! Well, fuck that! $ git commit -m "My first commit"
- 25. Let’s put some code in! $ echo "some code" > index.php $ git add index.php Oh shit, it is only added to the “index“! Well, fuck that! $ git commit -m "My first commit" But it is not on the remote server yet! $ git push ...
- 26. Nobody is looking, let’s commit everything! $ cat > index.php <?php Thousand lines of code ... ˆD $ git commit -a
- 27. What the hell did I do? (in the working tree) $ git diff
- 28. What the hell did I do a year ago? $ git log
- 29. I have no idea what I do Let’s not show it to everyone (yet)! $ git branch experimental $ git checkout experimental
- 30. What branch am I on? $ git branch -a
- 31. Turns out I am smart after all $ git checkout master $ git merge experimental
- 32. I was smart today Let’s show it to everyone $ git push <repository> <refspec>
- 33. I was smart today Let’s show it to everyone $ git push <repository> <refspec> Damn! Somebody was faster... Conflict =(
- 34. My code, let me show it to you! $ git clone <repository>
- 35. My code, let me show it to you! $ git clone <repository> Okay, I already have you repo, I want to laugh at your code! boss$ git pull <repository>
- 37. Submodules
- 38. Submodules $ git submodule add <repository> <path>
- 39. Submodules $ git submodule add <repository> <path> From the root directory!
- 40. Ranges $ git log 0af56ffa..HEAD
- 41. Ranges $ git log 0af56ffa..HEAD $ git diff v2.5..HEADˆ
- 42. Ranges $ git log 0af56ffa..HEAD $ git diff v2.5..HEADˆ $ git cherry-pick HEAD˜4..
- 43. Other fun stuff ◮ $ git revert ◮ $ git reset ◮ $ git stash ◮ $ git bisect ◮ $ git rebase ◮ $ git gc
- 44. Links ◮ Official git documentation ◮ github ◮ Git Cheat sheet