Comprehensive Introduction to Git: Concepts, Workflow, and Common Commands

Introduction

Li Hua, a newly hired Java developer, is thrust into a team that expects immediate proficiency with Git. He experiences anxiety, learns the basics under mentorship, manages to commit code, but ultimately faces dismissal due to insufficient Git skills, underscoring the need for rapid learning and adaptability in the workplace.

What Is Git?

Git is an open‑source distributed version‑control system originally created by Linus Torvalds to manage the Linux kernel. It stores every change in a database, enabling branching, merging, and history inspection.

Core Concepts

Repository

A repository holds the complete history of a project, including files, commits, branches, and tags, and can reside locally or on remote services such as GitHub or GitLab.

Working Directory

The working directory contains the actual files developers edit; checking out a branch copies its snapshot into this area.

Staging Area (Index)

Changes are first added to the staging area with git add before they become part of a commit.

Commit

A commit records a snapshot of the staged changes, identified by a unique SHA‑1 hash and accompanied by a message.

Branch

Branches allow parallel development; the main branch is typically master or main. New branches are created for features or bug fixes.

Merge

Merging integrates changes from one branch into another, using a three‑way merge algorithm to resolve conflicts.

Distributed Version Control

Each developer has a full copy of the repository, enabling offline work and easy synchronization via git clone, git push, and git pull.

Typical Git Workflow

Initialize repository: git init Add files: git add <files> Commit changes: git commit -m "message" View history: git log Create branch: git branch <name> Switch branch: git checkout <name> Merge branch:

git merge <branch>

Common Git Commands

1. Initialization & Configuration git init: create a new repository git config: set repository or global options

2. Cloning & Adding git clone: copy a remote repository locally git add: stage file changes

3. Committing & Syncing git commit: record staged changes git push: upload local commits to a remote git pull: fetch and integrate remote changes

4. Branching & Merging git branch: list/create/delete branches git checkout: switch branches or restore files git merge: combine branches

5. Inspection & Comparison git status: show working directory and staging area status git log: display commit history git diff: show unstaged changes git show: display various objects

6. Undo & Recovery git reset: move HEAD to a specified state git revert: create a new commit that undoes a previous one git rm: remove files from working directory and index

7. Remote Repositories git remote: manage remote connections git fetch: retrieve branches/tags from another repository

8. Tags git tag: list/create/delete tags

9. Miscellaneous git stash: temporarily save work-in-progress git blame: show last modification for each line git show-branch: display branch list and commits git cherry-pick: apply a specific commit onto the current branch

Important Notes

Use --force or -f with caution, as it can overwrite remote changes.

The -u or --set-upstream flag links a local branch to its remote counterpart for easier push/pull.

Conclusion

Git’s efficiency, flexibility, and distributed nature make it an essential tool for managing codebases and facilitating collaboration; mastering its core concepts and commands significantly improves development productivity and team coordination.

Source: blog.csdn.net/shiranyyds/ article/details/138768337