GIT

1. Introduction to Version Control and Git

• Objective: Understand what version control is and why Git is widely used.
• Topics:
  • What is Version Control?
  • Benefits of Git over other VCS (e.g., SVN, Mercurial).
  • Installing Git (Windows, macOS, Linux).
  • Configuring Git (username, email).
• Examples:

  git --version
  git config --global user.name "Your Name"
  git config --global user.email "your.email@example.com"
  

• Activity:
  • Install Git and set up global configurations.

2. Basic Git Commands and Workflow

• Objective: Learn basic Git operations.
• Topics:
  • Initializing a repository.
  • Cloning a repository.
  • Understanding Git states (Working Directory, Staging Area, Repository).
  • Adding and committing changes.
• Examples:

  git init
  git clone <repository_url>
  git add <file_name>
  git commit -m "Initial commit"
  

• Activity:
  • Create a new repository.
  • Make changes to a file and commit it.

3. Git Branching and Merging

• Objective: Learn how to work with branches.
• Topics:
  • Creating and switching branches.
  • Merging branches.
  • Resolving merge conflicts.
• Examples:

  git branch feature-branch
  git checkout feature-branch
  git merge feature-branch
  

• Activity:
  • Create a new branch for a feature.
  • Merge the branch back to the main branch.

4. Remote Repositories

• Objective: Understand remote repository concepts and collaboration.
• Topics:
  • Adding a remote repository.
  • Pushing changes.
  • Pulling changes.
  • Fetching updates.
• Examples:

  git remote add origin <repository_url>
  git push origin main
  git pull origin main
  git fetch origin
  

• Activity:
  • Create a remote repository on GitHub.
  • Push local changes to the remote repository.

5. Advanced Git Operations

• Objective: Master advanced Git functionalities.
• Topics:
  • Stashing changes.
  • Rebasing.
  • Cherry-picking commits.
  • Resetting and reverting changes.
• Examples:

  git stash
  git stash pop
  git rebase main
  git cherry-pick <commit_hash>
  git reset --hard <commit_hash>
  git revert <commit_hash>
  

• Activity:
  • Stash uncommitted changes and apply them later.
  • Rebase a feature branch onto the main branch.

6. Collaborating with Git

• Objective: Learn collaborative workflows.
• Topics:
  • Pull requests (PRs).
  • Forking and contributing to open-source projects.
  • Resolving conflicts in PRs.
• Examples:
  • GitHub/GitLab workflow for creating PRs.
• Activity:
  • Fork a repository, make changes, and create a PR.

7. Git Logs and History

• Objective: Learn how to inspect repository history.
• Topics:
  • Viewing commit history.
  • Comparing changes.
  • Tagging releases.
• Examples:

  git log
  git diff
  git tag -a v1.0 -m "Version 1.0"
  

• Activity:
  • View commit history and identify recent changes.

8. Undoing Changes

• Objective: Learn how to undo mistakes.
• Topics:
  • Undoing staged changes.
  • Undoing committed changes.
  • Recovering deleted files.
• Examples:

  git restore <file_name>
  git reset HEAD <file_name>
  git revert <commit_hash>
  

• Activity:
  • Experiment with undoing changes using reset and restore.

9. Working with Git Hooks

• Objective: Automate tasks with Git hooks.
• Topics:
  • Introduction to Git hooks.
  • Pre-commit and post-commit hooks.
• Examples:
  • Writing a pre-commit hook script to lint code.
• Activity:
  • Create a hook that prevents commits with empty messages.

10. Git Best Practices

• Objective: Learn best practices to work efficiently.
• Topics:
  • Writing meaningful commit messages.
  • Maintaining a clean commit history.
  • Keeping branches up to date.
• Activity:
  • Rewrite a messy commit history using git rebase -i.

11. Git for Team Collaboration

• Objective: Collaborate effectively in team projects.
• Topics:
  • Git workflows: Git Flow, Feature Branching.
  • Code reviews.
  • Managing large repositories.
• Examples:

  git flow init
  git flow feature start <feature_name>
  git flow release start <release_name>
  

• Activity:
  • Simulate a collaborative workflow using Git Flow.

12. Troubleshooting and Debugging

• Objective: Resolve common Git issues.
• Topics:
  • Diagnosing and fixing merge conflicts.
  • Resolving detached HEAD state.
  • Restoring lost commits.
• Examples:

  git reflog
  git merge --abort
  git cherry-pick <commit_hash>
  

• Activity:
  • Simulate common Git issues and resolve them.

13. Git with CI/CD Integration

• Objective: Integrate Git with CI/CD pipelines.
• Topics:
  • Automating tests with Git hooks.
  • Integrating Git with Jenkins, GitHub Actions, etc.
• Activity:
  • Set up a simple GitHub Actions workflow to run tests on commit.

14. Exploring Git Internals

• Objective: Understand how Git works under the hood.
• Topics:
  • Git objects (blobs, trees, commits).
  • Git pack files.
  • Git plumbing commands (cat-file, hash-object).
• Examples:

  git cat-file -p HEAD
  git hash-object -w <file_name>
  

• Activity:
  • Explore a Git repository’s .git directory.