Keywords: Git commit amendment | Force push | Branch divergence
Abstract: This article comprehensively examines secure methods for modifying pushed commit messages in Git, focusing on the usage scenarios of git commit --amend and various force-push options. By comparing differences between --force, --force-with-lease, and the + symbol, it elaborates best practices for safely rewriting history when ensuring no one has pulled changes, while providing solutions for identifying and handling branch divergence to help developers avoid data loss risks.
Modifying Recent Commit Messages
When needing to modify the message of the most recent commit, the git commit --amend command can be used. This operation opens the default editor, allowing users to edit the commit message. To directly replace the message content, add the -m parameter to specify the new message, for example: git commit --amend -m "Updated commit message". This step only modifies the commit record in the local repository.
Comparison of Force Push Options
After modifying the commit message, since the history has been rewritten, a force push must be used to update the remote repository. Git provides three main methods:
git push --force-with-lease <repository> <branch> is the safest option, as it checks whether the remote branch has been modified since the last fetch. If changes are detected, the push will abort, preventing accidental overwriting of others' commits.
git push <repository> +<branch> uses the plus prefix for force pushing, with effects similar to --force, but attention must be paid to the branch naming specification.
git push --force <repository> <branch> directly forces overwriting of the remote branch without any safety checks, and should only be used when certain there are no collaboration risks.
Identifying and Handling Branch Divergence
When local and remote branches diverge, Git provides multiple warning methods:
Running git status may display "Your branch and 'origin/main' have diverged." Executing git push and receiving a "non-fast-forward" error typically indicates branch divergence. git pull under specific configurations will explicitly prompt "You have divergent branches."
Common methods for handling divergence include: using git pull --rebase to preserve changes from both sides; employing git push --force when remote changes are invalid; and executing git reset --hard origin/main to synchronize with the remote state when local changes need to be discarded.
Modifying Non-Recent Commits
For modifying messages of non-recent commits, interactive rebase is required:
First run git rebase -i HEAD~n, where n represents the number of commits to modify. In the editor, change pick to r or reword before the target commits. After saving, Git will sequentially open editing interfaces for each commit to modify messages. Upon completion, use force push to update the remote repository.
Data Safety and Recovery
Force pushing doesn't actually delete data but rather orphans old commits. These commits can still be temporarily recovered via reflog, though they gradually disappear with system cleanup. Before using --force, confirm the target data scope to avoid accidentally deleting valid commits. It's recommended to create a backup branch before operations: git branch backup-branch.
Team Collaboration Considerations
Before modifying pushed history in shared repositories, it's essential to confirm that no one is developing based on the original commits. If collaboration risks exist, adding new corrective commits should be chosen over rewriting history. Enabling branch protection policies can prevent accidental force pushes and maintain repository stability.