go back to main content index

1. Introduction

1. 1. A Brief History of Revision Control
2. 2. The birth of Git
3. 3. Installation
4. 4. Get Ready

2. The Basics

1. 1. Create the example Site
2. 2. Initialize the Git Repository
3. 3. View the repository status
4. 4. Stage a snapshot
5. 5. Commit the Snapshot
6. 6. View the repository History
7. 7. Configure Git
8. 8. Create New HTML files
9. 9. Stage the New Files
10. 10. Commit The new Files
11. 11. Modify the HTML Pages
12. 12. Stage and Commit the Snapshot
13. 13. Explore the Repository
14. 14. Conclusion
15. 15. Quick Reference

3 Undoing Changes Rys Git Tutorial

1. 1. Display Commit Checksums
2. 2. View an Old Version
3. 3. View an Older Version
4. 4. Return to current version
5. 5. Tag a Release
6. 6. Try a Crazy Experiment
7. 7. Stage and Commit the Snapshot
8. 8. View the Stable Commit
9. 9. Undo Committed Changes (revert)
10. 10. Start a Smaller Experiment
11. 11. Undo Uncommitted Changes
12. 12. Conclusion
13. 13. Quick References

4 Branches I

1. 1. View existing Branches
2. 2. Checkout the Crazy Experiment
3. 3. Create a New Branch
4. 4. Make a Rainbow
5. 5. Stage and Commit the Rainbow
6. 6. Rename the Rainbow
7. 7. Return to the Master Branch
8. 8. Create a CSS Branch
9. 9. Add a CSS Stylesheet
10. 10. Link the Stylesheet
11. 11. Return to the Master Branch (again)
12. 12. Merge the CSS Branch
13. 13. Delete the CSS Branch
14. 14. Conclusion
15. 15. Quick Reference

5 Branches II

1. 1. Continue the Crazy Experiment
2. 2. Merge the CSS Updates
3. 3. Style the Rainbow Page
4. 4. Link to the Rainbow Page
5. 5. Fork an Alternative Rainbow
6. 6. Change the Rainbow
7. 7. Emergency Update
8. 8. Publish the News Hotfix
9. 9. Complete the Crazy Experiment
10. 10. Publish the Crazy Experiment
11. 11. Resolve the Merge Conflicts
    • 12. 12. Important conclusions about merging branches when you modify the same file
    • 13. 13. Another example to conclude
12. 14. Cleanup the feature Branches
13. 15. Rename Branches Local and Remote
14. 16. Conclusion
15. 17. Quick Reference

6 Rebasing

1. 1. Create an About Section
2. 2. Add an About Page
3. 3. Another emergency update!
4. 4. Publish News Hotfix
5. 5. Rebase the about Branch
   • 6. 6. Let's create an example modifying README.md file
6. 7. Add a Personal Bio
7. 8. Add Dummy Page for Mary
8. 9. Link to the About Section
9. 10. Clean up the Commit History
10. 11. Stop to Amend a Commit
11. 12. Continue the Interactive Rebase
12. 13. Publish the About Section
13. 14. Conclusion
14. 15. Quick References

7 Rewriting History

1. 1. Create the Red Page
2. 2. Create the Yellow Page
3. 3. Link and Commit the New Pages
4. 4. Create and commit the Green Page
5. 5. Begin an Interactive Rebase
6. 6. Undo the Generic Commit
7. 7. Split the Generic Commit
8. 8. Remove the last Commit
9. 9. Open the Reflog
10. 10. Revive the Lost Commit
11. 11. Filter the Log History
12. 12. Merge in the Revived Branch
13. 13. Conclusion
14. 14. Quick Reference

Own Experiences using

8 Remotes

1. 1. Clone the Repository (Mary)
2. 2. Configure The Repository (Mary)
3. 3. Start Mary's Day (Mary)
4. 4. Create Mary's Bio Page
5. 5. Publish the Bio Page (Mary)
6. 6. View Remote Repositories (Mary)
7. 7. Return to Your Repository (you)
8. 8. Add Mary as a Remote (you)
9. 9. Fetch Mary's Branches (you)
10. 10. Check out a Remote Branch
11. 11. Find Mary's Changes
12. 12. Merge Mary's Changes
13. 13. Push a Dummy Branch
14. 14. Push a New Tag
15. 15. Conclusion
16. 16. Quick Reference

9 Centralized Workflows

1. 1. Create a Bare Repository (Central)
2. 2. Update Remotes (Mary and You)
3. 3. Push the Master Branch
4. 4. Add News Update (You)
5. 5. Publish the News Item (You)
6. 6. Update CSS Styles (Mary)
7. 7. Update another CSS Style
8. 8. Clean up Before Publishing (Mary
9. 9. Publish CSS Changes (Mary
10. 10. Pull in Changes (Mary)
11. 11. Pull in Changes (you)
12. 12. Conclusion
13. 13. Quick Reference

10 Distributed Workflows

1. 1. Create a Bitbucket Account
2. 2. Create a Public Repository (you)
3. 3. Push to a Public Repository (you)
4. 4. Browse the Public Repository (you)
5. 5. Clone the Repository (John
6. 6. Add the Pink Page (John)
7. 7. Publish the Pink Page (John)
8. 8. View John's Contributions (you)
9. 9. Integrate John's Contributions (you)
10. 10. Publish John's Contributions (you)
11. 11. Update Mary's Repository (Mary)
12. 12. Update John's Repository (John)
13. 13. Conclusion

11 Patch Workflows

1. 1. Change the Pink Page (Mary)
2. 2. Create a Patch
3. 3. Add a Pink Block (Mary)
4. 4. Create Patch of Entire Branch (Mary)
5. 5. Mail the Patches (Mary)
6. 6. Apply the Patches (you)
7. 7. Integrate The Patches (you)
8. 8. Update Mary's Repository (Mary)
9. 9. Conclusion
10. 10. Quick Reference

12 Tips and Tricks

1. 1. Archive The repository
2. 2. Bundle the Repository
3. 3. Ignore a File
4. 4. Stash Uncommitted Changes
5. 5. Hook into Git's internals
6. 6. View Diffs Between commits
7. 7. Reset and checkout files
8. 8. Aliases and Other Configurations
9. 9. Conclusion
10. 10. Quick Reference

13 Plumbing

1. 1. Examine Commit Details
2. 2. Examine a tree
3. 3. Examine a Blob
4. 4. Examine a Tag
5. 5. Inspect Git's Branch Representation
6. 6. Explore the Object Database
7. 7. Collect the Garbage
8. 8. Add Files to the index
9. 9. Store the Index in the Database
10. 10. Create a Commit Object
11. 11. Update HEAD
12. 12. Conclusion
13. 13. Quick Reference