删除中间的GIT提交

Question

I have an intermediate git commit which i have merged into the code now. It happened by mistake. I have 2 options:

1. Delete the project from gerrit, for which i have to install the delete-project plug in
2. Delete the commit from the GIT repository.

I would like to have suggestions on using the second option as i do not have the admin access to install the plugin.

commit 1

commit 2

I would like to keep the commit 1 and delete the commit 2. The commit 2 is a direcotry which has many number of files in it.

Any suggestions ?

Answer 1

如果您想保留最新的提交，最好使用git rebase： http : //git-scm.com/docs/git-rebase

Answer 2

What about a normal revert? You want to purge it because of its size?

Then you need the Force Push access right [EDIT: in Gerrit], which enables you to do a

git push --force

after you skipped back that one commit with

git reset --hard HEAD^

Be aware that rewriting history is to be avoided when working on a repository with a team of developers.

Answer 3

I Think you are looking for

$ git reset --hard REF

Here REF will be SHA1 of commit 1 .

Answer 4

Okay, so you want to get rid of one commit.

If you haven't already pushed out the commit, you could drop it locally with

git reset --hard HEAD~

which checks out the revision right before the current.
Your history before: commit1--commit2
Your history after: commit1

If you already pushed the commit, as long as there's no critical in commit2 (huge, passwords, etc), it's better to keep commit2 in the history and revert the commit instead of dropping it:

git revert <sha-of-commit2>

This will create a NEW commit that reverts the changes made by commit2 .
Your history before: commit1--commit2
Your history after: commit1--commit2--commit3