How does git commit --amend work, exactly?
Shaun Luttin
I have seen GIT commit --amend in detached HEAD state. The question requires the answer to be more complex than needs be. I'd like to understand just how git commit --amend works in a normal HEAD situation.
jub0bs
Assume that you're in a clean working state and that your repo looks as follows:
If you then run
git commit --amend
write a commit message, save and quit your editor, the following happens:
- 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. - The
masterbranch reference is moved to point to that new commit (31b8e). - The
HEADreference followsmaster.
Note that the amended commit (f42c5) is now unreachable from any reference in your repo (hence its "transparent" style on my graph). It still lives in your repository's object database, but 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 repo 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:
But now, commit 31b8e would become unreachable.
Collected from the Internet
Please contact [email protected] to delete if infringement.
edited at
- Prev: How do I scale an SVG background-image without honoring aspect ratio in Firefox?
- Next: cannot import name is_secure_transport
Related
Related Related
- 1
How to undo a git commit --amend
- 2
What exactly is the git extensions "Amend last commit" button doing?
- 3
Does git commit --amend include the files that were in the last commit?
- 4
Does git commit --amend overwrite the old commit completly?
- 5
How to undo "git commit --amend" done instead of "git commit"
- 6
Git: How to reuse commit rev across commit --amend?
- 7
How to git bzr push after git commit --amend?
- 8
How can I amend a non-HEAD commit with Git?
- 9
How to edit/amend commit messages for commits previous to the last in Git?
- 10
How can I amend a non-HEAD commit with Git?
- 11
Git : an Equivalent to an interactive commit amend?
- 12
Git : an Equivalent to an interactive commit amend?
- 13
Understanding git commit with amend option
- 14
"git commit --amend -c <commit>" not saving changes
- 15
Cannot git merge because git commit --amend
- 16
How to remove ignored files from current commit using git commit --amend
- 17
How exactly does the callstack work?
- 18
How exactly does CMake work?
- 19
How does lock work exactly?
- 20
How does keytab work exactly?
- 21
How exactly does linking work?
- 22
How exactly does the MenuInflater work?
- 23
How does the << Operator exactly work?
- 24
How does this for/in loop work exactly?
- 25
How exactly does a proxy work?
- 26
How exactly does linking work?
- 27
How exactly does DNS work?
- 28
How exactly does "/bin/[" work?
- 29
How does this for/in loop work exactly?
Comments