Skip to content

EN_IT_Web_Git

somaz edited this page Mar 30, 2026 · 1 revision

IT Terminology: Web & Git

1. Web 1.0 vs Web 2.0 vs Web 3.0

The evolution of the Internet through Web 1.0, Web 2.0, and Web 3.0 represents distinct phases with unique characteristics and technologies. These stages reflect changes in how the Internet is used and its underlying technologies.

Web 1.0

  • Web 1.0, prevalent in the 1990s, is the early stage of the Internet primarily designed for information retrieval. This phase of the web was more about users accessing and consuming data.
  • Often referred to as the "read-only" web, Web 1.0 lacked the rich formatting, visuals, interactive elements, and user-generated content that characterize later web versions.

Web 2.0

  • Emerging in the early 2000s, Web 2.0 represents the social phase of the Internet. It shifted the focus towards participation, collaboration, and content creation by users.
  • Known as the "participative social web," Web 2.0 is characterized by the growth of social networks, blogs, and user-generated content, transforming users from passive consumers to active participants.

Web 3.0

  • Web 3.0, still evolving and not yet fully defined, is the latest phase of the Internet. It builds upon decentralized networks and blockchain technology.
  • The foundations of Web 3.0 are decentralization, openness, and

2. Git

Git is a distributed version control system widely used for source code management in software development. This system allows multiple developers to work on a project simultaneously without interfering with each other. Git tracks file changes and coordinates collaboration between multiple contributors. It integrates functions such as branch creation, merging, and reverting to help manage various versions of a project efficiently and maintain a systematic change history.

Main Functions

  • Distributed Architecture:

    • Each developer has a complete copy of the entire repository and its history, supporting offline work and redundancy.
  • Branches and Merges:

    • Facilitates easy creation and merging of branches for experimenting with new features or fixing bugs.
  • Staging Area:

    • A unique concept where changes are first staged before being committed to the repository history.
  • Efficiency:

    • Git is optimized for performance and adept at handling large projects.
  • Data Integrity:

    • All changes are trackable and searchable through checksums.

Git Basic Terminology

  • Working Directory:

    • The directory where the currently worked-on files are located.
  • Staging Area:

    • An area where changes are temporarily gathered before being committed.
  • Repository:

    • The place where all versions and history of the project are stored.
  • Commit:

    • A process where changes in the staging area are permanently recorded in the repository.
  • Branch:

    • A means for separating and managing tasks.
  • Merge:

    • The process of combining two or more branches into one.

Differences Between Git and GitHub

  • Git:

    • A version control system for managing the change history of source code.
  • GitHub:

    • A web service that hosts projects using Git, providing additional features like collaboration, issue tracking, and code review.

Git Commands

# Initialize a new Git repository
git init

# Check the status of the repository
git status

# Add files to the staging area
git add <filename>
git add .  # Add all changes

# Commit changes with a message
git commit -m "commit message"

# Push changes to the remote repository
git push

# View commit history
git log

# Compare staged changes with the last commit
git diff --staged

# Create a new tag
git tag <tag-name>

# Delete a tag locally
git tag --delete <tag-name>

# Delete a tag from the remote repository
git push origin --delete <tag-name>

# Push tags to the remote repository
git push --tags

# List all tags
git tag

# Clone a repository
git clone <repository-url>

# Fetch changes from the remote repository
git fetch

# Merge changes from a remote branch
git merge <branch-name>

# Pull changes from the remote repository (fetch + merge)
git pull

# Check the status of branches (local and remote)
git branch -a

# Create a new branch
git branch <new-branch-name>

# Switch to a different branch
git checkout <branch-name>

# Create and switch to a new branch
git checkout -b <new-branch-name>

# Stash changes in the working directory
git stash

# Apply stashed changes
git stash pop

# Show remote repositories
git remote -v

# Add a new remote repository
git remote add <remote-name> <repository-url>

# Remove a remote repository
git remote remove <remote-name>

# Show changes not yet staged
git diff

Git Branch Creation and Merging Process

This demonstrates the workflow in which a feature branch is created from the master branch. Changes are applied and committed to the feature branch and then merged back into the master branch to implement new features or updates. Git Branch Creation and Merging Process


Reference

Clone this wiki locally