Master Git: From Basics to Advanced Commit Management

Why Use Version Control

When working with frequently changing files such as code, tracking and recording changes is essential. Version control systems (VCS) provide a history of modifications, identify who made each change, when it was made, and what was changed, and allow you to revert problematic commits.

Git Commit Object

A commit object in Git stores a snapshot of the entire project state. Each commit has a globally unique SHA‑1 hash (e.g., 998622294a6c520db718867354bf98348ae3c7e2) that can be abbreviated for convenience. The commit object contains the author information and commit message. Unlike many systems that store only deltas, Git stores the full state for each commit.

Git Commit Practice

Initialize an empty repository and inspect its status:

$ git init hackers
$ cd hackers
$ git status

Output shows that the repository is on the master branch with no commits yet.

Staging Area Operations

Git uses three areas: the working directory, the index (staging area), and the repository. To move changes from the working directory to the index, use git add. You can add all changes, add interactively with git add -p, or remove files from the index with git rm. To unstage changes, use git reset (or git reset FILE / git reset -p for selective resets). Inspect staged changes with git diff --staged and unstaged changes with git diff.

Committing Changes

When satisfied, create a commit with git commit. For a quick commit of all tracked changes, use git commit -a. It is recommended to keep each commit focused on a single logical change.

Reference Operations

References in Git consist of branches and tags . Create a branch with git branch b, switch to it with git checkout b, and merge changes back to master as needed. Tags are immutable pointers useful for releases.

After a Commit

Explore commit history with git log (or git log --oneline), view diffs with git log -p, and examine specific references with git show master. Use git checkout NAME to detach HEAD at a specific commit, git revert NAME to undo a commit, or git reset NAME to move the branch pointer.

Git Conflict Resolution

When merging branches, conflicts may arise. Git identifies a common ancestor, attempts to combine changes, and creates a merge commit. Resolve conflicts by editing the conflicted files (look for <<<<<<<, =======, >>>>>>> markers) or using git mergetool. After fixing, stage the resolved files with git add . and finalize the merge with git commit. If needed, abort with git merge --abort.

Push Failures and Remedies

If git push is rejected, it usually means the remote has new commits you don’t have locally. Resolve by pulling and merging ( git pull), or force‑push with caution ( git push --force-with-lease) when you are sure no other work will be lost.

Conclusion

This article covered essential Git commands and concepts to give readers a solid foundation in version control. Mastering these basics opens the door to deeper Git features and more efficient collaboration.