Ok, this is a little danger but i will try with an example.

1. This is the history of my master:

reset1.png1441×306 29 KB

2. I want to delete the second commit with description “this commit need to be deleted”. The first thing to do is to get the commit ID of the previous commit, in my case the commit is “reset here”. You can get the commit id by the web UI:

reset2.1.png1508×339 64 KB

reset2.2.png1441×306 58.8 KB

Or with command line:

git log

with output:

commit 2e45e59114bbb7f6b36b8e8598415a96690190e4
Author: Gabriele Puliti <gabriele.puliti@gmail.com>
Date: Wed Jan 30 16:57:56 2019 +0100
i want this file on history

commit a18476877494ec36e30fa4edc0850bbf36f08100

Author: Gabriele Puliti <gabriele.puliti@gmail.com>

Date: Wed Jan 30 16:57:21 2019 +0100
this commit need to be delete

commit_<u><strong>dd9723792537280460bfa67d8319086fed79e1f</strong></u>_<u><strong>&lt;------------------ THIS IS THE ID</strong></u>Author: Gabriele Puliti <gabriele.puliti@gmail.com>

Date: Wed Jan 30 16:56:29 2019 +0100
reset here

Copy this value.

3. And now reset to this commit by paste that ID after the reset command:

git reset dd9723792537280460bfa67d8319086fed79e1fa

this move the local history to this commit.

4. If you dont want the changes made by the last commit you can jump to the next step (point 5). Otherwise you need to create a new branch, for example called “helper”:

git checkout -B helper

and cherry-pick the last commit, in my case the commit with description “i want this file on history” , using the commit ID of this commit:

git cherry-pick 2e45e59114bbb7f6b36b8e8598415a96690190e4

(Remeber that the working tree need to be empty, so commit or remove the dirty files.)

Now you need to merge this new branch into master, so checkout to master:

git checkout master

And merge:

git merge helper

You can now remove the “helper” branch:

git branch -D helper

5. Last step you need to force push to remote:

git push --force origin master

This is the last command you need to run.

6. If you follow the point 4 you have:

reset3.png1441×209 19.9 KB

Otherwise you only have:

reset4.png1449×125 9.61 KB

Hope this helps 🙂  

-Gabriele-

Mark helpful posts with Accept as Solution to help other users locate important info. Don’t forget to give Kudos for great content!