Git - What is Git?

What is Git?

Introduction

Git is a free and open-source distributed version control system designed to handle everything from small to very large projects with speed and efficiency. Created by Linus Torvalds in 2005, Git has become the de facto standard for version control in modern software development. Its distributed nature allows multiple developers to work on the same project independently without interfering with each other’s progress.

Why Git?

Before Git, developers used centralized version control systems like CVS, Subversion (SVN), or Perforce. These systems had limitations, particularly in speed, flexibility, and support for distributed workflows. Git was built to overcome these challenges. It offers:

• Fast performance
• Robust support for non-linear development (thousands of parallel branches)
• Fully distributed architecture
• Strong support for data integrity

Features of Git

1. Distributed System

Every developer's working copy of the code is also a repository with complete history and full version tracking capabilities, independent of network access or a central server.

2. Fast Performance

Git is optimized for performance. Features like committing changes, branching, merging, and comparing past versions are all designed to be as fast as possible.

3. Data Integrity

Git uses SHA-1 hashing to name and identify objects within its database. This ensures the integrity of your version history.

4. Branching and Merging

Branching is a core concept in Git and is used extensively. Git makes it easy to create, merge, and delete branches.

# Create a new branch
git branch new-feature

# Switch to the new branch
git checkout new-feature

# Merge it back to main
git checkout main
git merge new-feature

Understanding How Git Works

Snapshots, Not Differences

Git thinks about its data more like a series of snapshots of a miniature filesystem. Each time you commit, Git takes a picture of what all your files look like at that moment and stores a reference to that snapshot.

Local Operations

Most operations in Git only need local files and resources to operate — generally no information is needed from another computer on your network. This means you can work offline.

Integrity and Checksums

Git uses a SHA-1 hash to uniquely identify every object in its database. This guarantees the integrity of the codebase and protects against corruption.

# Example of SHA-1 hash
e83c5163316f89bfbde7d9ab23ca2e25604af290

Basic Git Terminology

Repository

A Git repository is a storage space where your project lives. It can be local to a folder on your computer or hosted on a server like GitHub, GitLab, or Bitbucket.

Clone

A clone is a copy of an existing Git repository. It can be local or remote.

git clone https://github.com/username/repository.git

Commit

A commit is a snapshot of your repository at a particular point in time.

git commit -m "Add new feature"

Branch

A branch is a parallel version of your project. It is contained within the repository but does not affect the primary or main branch.

Merge

Merging takes the changes from one branch and applies them into another.

Pull

Pulling means fetching and downloading content from a remote repository and immediately updating the local repository to match that content.

git pull origin main

Push

Pushing means to send your committed changes to a remote repository on GitHub or another host.

git push origin main

Git Workflow

Step-by-Step Example

1. Initialize a new Git repository:

git init

2. Add files to staging:

git add .

3. Commit changes:

git commit -m "Initial commit"

4. Connect to remote repository:

git remote add origin https://github.com/username/repo.git

5. Push to remote:

git push -u origin main

Git vs Other Version Control Systems

Git vs SVN

Common Git Commands

Checking Status

git status

Viewing Commit History

git log

Creating a Branch

git branch feature-branch

Switching Branch

git checkout feature-branch

Staging Files

git add filename.txt

Removing Files

git rm filename.txt

Undoing Changes

git checkout -- filename.txt

Working with Remote Repositories

Adding a Remote

git remote add origin https://github.com/user/repo.git

Fetching Changes

git fetch

Pulling Changes

git pull origin main

Pushing Changes

git push origin main

Git Configuration

Set Username and Email

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

Check Configuration

git config --list

Set Default Editor

git config --global core.editor "code --wait"

Advanced Git Concepts

Rebase

Rebasing is another way to integrate changes from one branch into another. It is cleaner than merging in some scenarios.

git rebase main

Stashing

Stashing allows you to save your uncommitted changes temporarily.

git stash
git stash pop

Cherry-Pick

Apply a commit from one branch onto another.

git cherry-pick commit_hash

Tagging

Tags are used to mark specific points in history as important — typically used for releases.

git tag -a v1.0 -m "Version 1.0"
git push origin v1.0

Git Tools and Platforms

GitHub

GitHub is a platform built around Git that adds collaboration features such as pull requests, issues, and CI/CD.

GitLab

GitLab provides Git repository management with built-in CI/CD pipelines and project planning.

Bitbucket

Bitbucket supports Git and Mercurial repositories and integrates well with Jira and Trello.

Git is a powerful, efficient, and widely used version control system that is critical in modern software development. Its ability to manage source code history, facilitate collaboration, and ensure data integrity makes it indispensable. Whether working solo or as part of a team, learning Git is essential for any developer. As you continue to explore Git, you’ll encounter many more advanced features that make it an even more effective tool.