DokuWiki

1. Introduction
2. What is Git?
   1. Understanding version control
   2. The history of Git
   3. About distributed version control
   4. Who should use Git
3. Installing Git
   1. Installing Git on a Mac
   2. Configuring Git
   3. Exploring Git auto-completion
   4. Using Git help
4. Getting Started
   1. Initializing a repository
   2. Understanding where Git files are stored
   3. Performing your first commit
   4. Writing commit messages
   5. Viewing the commit log
5. Git Concepts and Architecture
   1. Exploring the three-trees architecture
   2. The Git workflow
   3. Using hash values (SHA-1)
   4. Working with the HEAD pointer
6. Making Changes to Files
   1. Adding files
   2. Editing files
   3. Viewing changes with diff
   4. Viewing only staged changes
   5. Deleting files
   6. Moving and renaming files
7. Using Git with a Real Project
   1. Initializing Git
   2. Edits
8. Undoing Changes
   1. Undoing working directory changes
   2. Unstaging files
   3. Amending commits
   4. Retrieving old versions
   5. Reverting a commit
   6. Using reset to undo commits
   7. Demonstrating a soft reset
   8. Demonstrating a mixed reset
   9. Demonstrating a hard reset
   10. Removing untracked files
9. Ignoring Files
   1. Using .gitignore files
   2. Understanding what to ignore
   3. Ignoring files globally
   4. Ignoring tracked files
   5. Tracking empty directories
10. Navigating the Commit Tree
    1. Referencing commits
    2. Exploring tree listings
    3. Getting more from the commit log
    4. Viewing commits
    5. Comparing commits
11. Branching
    1. Branching overview
    2. Viewing and creating branches
    3. Switching branches
    4. Creating and switching branches
    5. Switching branches with uncommitted changes
    6. Comparing branches
    7. Renaming branches
    8. Deleting branches
    9. Configuring the command prompt to show the branch
12. Merging Branches
    1. Merging code
    2. Using fast-forward merge vs. true merge
    3. Merging conflicts
    4. Resolving merge conflicts
    5. Exploring strategies to reduce merge conflicts
13. Stashing Changes
    1. Saving changes in the stash
    2. Viewing stashed changes
    3. Retrieving stashed changes
    4. Deleting stashed changes
14. Remotes
    1. Using local and remote repositories
    2. Setting up a GitHub account
    3. Adding a remote repository
    4. Creating a remote branch
    5. Cloning a remote repository
    6. Tracking remote branches
    7. Pushing changes to a remote repository
    8. Fetching changes from a remote repository
    9. Merging in fetched changes
    10. Checking out remote branches
    11. Pushing to an updated remote branch
    12. Deleting a remote branch
    13. Enabling collaboration
    14. A collaboration workflow
15. Tools and Next Steps
    1. Setting up aliases for common commands
    2. Using SSH keys for remote login
    3. Exploring integrated development environments
    4. Exploring graphical user interfaces
    5. Understanding Git hosting
16. Conclusion