Git — The Distributed Version Control System

What it is

Git is the most widely used version control system in the world. Created by Linus Torvalds for Linux kernel development, it tracks changes in source code with distributed repositories, branching, merging, and a staging area. Every developer has a complete copy of the repository history, enabling offline work and fast operations.

Git is used by virtually every software development team and is the foundation for platforms like GitHub, GitLab, and Bitbucket.

How it saves time or tokens

Git's branching model lets developers work on features, fixes, and experiments in isolation without affecting the main codebase. Branches are lightweight (just a pointer to a commit), so creating and switching branches is instant. The staging area lets you craft precise commits by selecting exactly which changes to include. Merge and rebase workflows enable teams to collaborate without stepping on each other's work.

How to use

1. Install and configure Git:

# macOS
brew install git

# Configure identity
git config --global user.name 'Your Name'
git config --global user.email 'you@example.com'

1. Create a repository and make commits:

mkdir my-project && cd my-project
git init
echo '# My Project' > README.md
git add README.md
git commit -m 'Initial commit'

1. Branch, develop, and merge:

git checkout -b feature/auth
# ... make changes ...
git add -A && git commit -m 'Add authentication'
git checkout main
git merge feature/auth

Example

A typical Git workflow with remote repository:

# Clone a repository
git clone https://github.com/org/project.git
cd project

# Create a feature branch
git checkout -b feature/search

# Make changes, stage selectively
git add src/search.ts src/search.test.ts
git commit -m 'Add full-text search with pagination'

# Push and create pull request
git push -u origin feature/search
# Open PR on GitHub/GitLab

# After review, merge
git checkout main
git pull
git merge feature/search
git push

Related on TokRepo

• Coding tools — Browse developer tools and utilities
• DevOps tools — Explore version control and CI/CD tools

Common pitfalls

• Committing large binary files or sensitive data (API keys, passwords). Use .gitignore to exclude them and git-secrets or pre-commit hooks to prevent accidental commits.
• Not pulling before pushing, leading to merge conflicts. Run git pull --rebase before pushing to keep a clean history.
• Using git add . without reviewing changes. This can stage unintended files. Use git add -p for interactive staging or git diff --staged to review before committing.