Methods and Practices for Resetting or Reverting Files to Specific Revisions in Git

Fundamental Principles of File Restoration in Git

During software development, there is often a need to restore modified files to previous specific version states. Git, as a distributed version control system, provides powerful capabilities for tracking historical records and restoring files. Understanding Git's file restoration mechanism requires starting from the core concepts of version control.

Identifying Target Commit Versions

Before performing file restoration operations, it is essential to determine the hash value of the target commit. Using the git log command allows viewing the commit history of a file:

git log -- path/to/file

This command displays all relevant commit records for the specified file, including commit hashes, authors, dates, and commit messages. By analyzing this information, the specific version to restore can be determined.

Using git checkout for File Restoration

The git checkout command is the primary tool for restoring files to specific versions. Its basic syntax is:

git checkout <commit-hash> -- <file-path>

For example, to restore the file src/app.js to its state at commit c5f567:

git checkout c5f567 -- src/app.js

The double hyphen -- in the command separates the commit hash from the file path, ensuring Git correctly parses the parameters. After execution, the specified file in the working directory will be replaced with the version from the target commit.

Relative Commit References

Git supports using relative references to locate commits. To restore to the version before the target commit, the ~ symbol can be used:

git checkout c5f567~1 -- src/app.js

Here, ~1 indicates moving backward by 1 commit, and the number can be adjusted as needed. This relative referencing method is particularly useful when dealing with consecutive commits.

Evolution of git restore Command

Git introduced the specialized git restore command to handle working copy file restoration. Compared to git checkout, git restore has clearer semantics:

git restore --source=c5f567 -- src/app.js

It is important to note that although git restore is designed to be more specialized, this command is currently still marked as experimental and requires careful evaluation when used in production environments.

Post-Restoration Commit Process

After using git checkout to restore a file, the file status becomes modified but unstaged. The standard Git workflow needs to be executed:

git add src/app.js
git commit -m "Restored src/app.js to state at commit c5f567"

This process creates a new commit record that explicitly documents the file restoration operation, maintaining the integrity of the version history.

Security Considerations

File restoration operations overwrite current content in the working directory, so before execution, ensure:

• All necessary modifications have been saved
• The correctness of the target commit hash has been confirmed
• Backups have been created before operations on important projects

Particularly in team collaboration environments, avoid using force push (git push --force) unless the impact on the remote repository is fully understood.

Command Selection Strategy

When choosing file restoration methods, consider:

• git checkout: Mature and stable, suitable for all Git versions
• git restore: Clear semantics, represents the development direction of Git commands
• Relative references: Simplify locating consecutive commits

In practical development, it is recommended to select appropriate tools based on the team's technology stack and Git version, and clearly define usage specifications in project documentation.