Git 如何恢复到某个提交，但保留我所做的所有提交

Question

Suppose I have commits ABCDEF. Note that all the commits have been pushed upstream.

I want to revert to commit D, but also want to keep commits E and F in the branch.

So what I want to do is to create a commit G, which will have the same contents as D. In the end my branch will look like ABCDEFG, with D=G.

How do I do this?

Answer 1

You just have to take the exact content of D , and create a commit with that content:

# choose a. or b. :
# a. 'git restore' was added for this purpose in version 2.25,
#    and has options which are more explanatory (readable at least) :
git restore --source D --staged --worktree -- .

# b. for older gits, or for people enjoying more obscure commands, there is 'git read-tree' :
git read-tree D

# after that :
# confirm that the content you expect is staged, and commit :
git status
git commit