如何使用分离的 HEAD 提交覆盖提交？

Question

I have a branch that looks like this

---A-----------B
    \
     \
      C (Detached HEAD)

I got it by this process:

git checkout branch
git checkout HEAD~
git commit -m "C"

and I want C to overwrite B (discard all changes in B)

Best would be without merging temp branch because I want the branch graph to look as simple as possible

Answer 1

Force delete the branch and create branch on the C commit. Do force push if branch is in any remote repository.

If you can repeate the commit (ie you have a diff saved somewhere), you can reset branch's HEAD to HEAD~ and then do the commit.

Answer 2

git checkout <C>

git branch -D branch

git checkout -b branch

Your graph will become:

---A-----C <== branch
    \
     \---B

If B is already in the remote repository, use "git push -f" to force the push. B will be garbage collected in the future.

Answer 3

git checkout sha1ofcommittokeep git push --force-with-lease origin HEAD:branchtooverwrite