Introduction to Git Version Control

Introduction to Git

• Git is a distributed version control system, meaning it doesn't rely on a central server. Each user's local repository holds a complete project history.
• This enables offline work and strong backups.
• Git is primarily for code, but functions for any project needing version control.

Key Concepts

• Repository: A directory storing project files and version history.
• Working Directory: The current project folder on your computer.
• Staging Area (Index): A temporary area for preparing files to be added to a commit.
• Commit: A permanent snapshot of the project at a specific time. It records changes made.
• Branch: A separate development line for features or fixes. Changes merge back to the main branch.
• Remote Repository: A copy of the project's repository on a server. Facilitating collaboration.
• Clone: Making a local copy of a remote repository.
• Push: Uploads local repository changes to remote.
• Pull: Downloads remote repository changes to local.
• Merge: Combining changes from one branch to another.
• Stash: Temporarily saving uncommitted changes for later use, aiding branch switching.

Basic Git Commands

• git init: Initializes a new Git repository.
• git status: Displays tracked and untracked files. Shows working directory and staging area changes.
• git add <filename>: Stages a file. git add . stages all changes.
• git commit -m "<message>": Creates a commit. The message helps explain changes.
• git branch <name>: Creates a branch.
• git checkout <name>: Switches to a branch.
• git push <remote> <branch>: Uploads a local branch.
• git pull <remote> <branch>: Retrieves remote changes.
• git log: Displays commit history.
• git diff: Shows changes between versions.
• git merge <branch>: Merges changes.

Git Workflow

• New Branch: git branch new_feature; git checkout new_feature.
• Changes: Add changes to the staging area: git add ..
• Commit: git commit -m "Added new feature".
• Push: git push -u origin new_feature.
• Pull Updates: git pull origin master. Keeps local aligned with remote.
• Conflicts: Git helps merge remote and local changes.
• Continue Work: git push to the remote completed branch.
• Merge back to Master: git checkout master, git merge new_feature, then git push origin master.

Advanced Git Topics

• Rebasing: Rewrites commit history, useful for feature branches.
• Cherry-picking: Selects specific commits and applies them elsewhere.
• Remote Branches: Support collaboration and remote repository sharing.
• Git Hooks: Scripts triggered by Git events.

Collaboration Using Git

• Cloning: git clone <repository URL>. Creates a local copy.
• Pushing/Pulling: Synchronizes local and remote repositories. Enhances collaborative development.
• Branching/Merging: Enables parallel feature development and seamless integration.
• Resolving Conflicts: Git's tools assist in merging file changes made by multiple users.

Useful Git Tips

• Use clear commit messages.
• Commit frequently.

This quiz covers the fundamental concepts of Git, a distributed version control system that helps manage changes in projects. Learn about key components such as repositories, working directories, staging areas, commits, and branches, which are essential for effective version control. Test your understanding of Git's functionality and its benefits for both coding and project management.