How does git commit –amend work, exactly?

by

Assume that you’re in a clean working state and that your repository looks as follows:

Enter image description here

If you then run

git commit --amend

write a commit message, save and quit your editor, the following happens:

  1. Your staging area—which, if you haven’t staged any new changes, will be identical to commit f42c5—is used to create a new commit: 31b8e. Its parent(s) will be the same as that (those) of the commit you’re amending: f42c5.
  2. The master branch reference is moved to point to that new commit (31b8e).
  3. The HEAD reference follows master.

Enter image description here

Note that the amended commit (f42c5) is now unreachable from any reference in your repository (hence its “transparent” style on my graph). It still lives in your repository’s object database, but it will eventually be deleted for good, when Git runs its periodic housekeeping, or if you trigger it explicitly by running git gc (garbage collection).

Addendum (based on Jason Baker’s comment): Note that, as long as the amended commit, f42c5, still exists in your repository and you have a way of finding out its commit ID (for example, by fishing it out of the master branch’s reflog), you can still check it out. Running

git checkout master # just to be sure that master is the current branch
git reset --hard f42c5

or (assuming you haven’t, in the meantime, made any new commit on master, reset master, or otherwise moved the master branch reference)

git checkout master # just to be sure that master is the current branch
git reset --hard master@{1}

would put you in the following situation:

Enter image description here

But now, commit 31b8e would become unreachable.

More Related Contents:

  1. How to modify existing, unpushed commit messages?
  2. How do I push amended commit to the remote Git repository?
  3. Edit the root commit in Git?
  4. How to amend a commit without changing commit message (reusing the previous one)?
  5. Accidentally pushed commit: change git commit message
  6. Message ‘src refspec master does not match any’ when pushing commits in Git
  7. Commit only part of a file in Git
  8. How do I commit case-sensitive only filename changes in Git?
  9. How can I remove a commit on GitHub? [duplicate]
  10. Make the current commit the only (initial) commit in a Git repository?
  11. Undo git reset –hard with uncommitted files in the staging area
  12. Remove files from Git commit
  13. What are the differences between “git commit” and “git push”?
  14. Link to the issue number on GitHub within a commit message
  15. git: Your branch is ahead by X commits
  16. What is a Git commit ID?
  17. How to undo “git commit –amend” done instead of “git commit”
  18. How to change the commit author for a single commit?
  19. Remove file from latest commit
  20. How to amend several commits in Git to change author
  21. How to find the commit in which a given file was added?
  22. How do I make a Git commit in the past?
  23. Commit only part of a file’s changes in Git
  24. How can I undo a `git commit` locally and on a remote after `git push`
  25. Remove a git commit which has not been pushed
  26. Using IntelliJ to amend git commit message
  27. Telling if a Git commit is a Merge/Revert commit
  28. Xcode 9 commit: Couldn’t communicate with helper application
  29. Why does ‘git commit’ not save my changes?
  30. Is it possible to set a git commit to have a timestamp prior to 1970?

Leave a Comment