git revert a specific commit avoiding a merge

Question

I would like to remove a specific commit on a git repository in order to be able to remove a "fix" applied to my software.

There it is an EMC :

#!/bin/bash rm -rf TEST .git mkdir TEST git init echo "info 1" > TEST/file.txt git add TEST/ git commit -m "Initial Commit" echo "info 2" >> TEST/file.txt git add TEST/ git commit -m "Commit Fix 1 on file" echo "info 3" >> TEST/file.txt git add TEST/ git commit -m "Commit Fix 2 sur file"

the result of file.txt will be

info 1 info 2 info 3

And I would like to obtain the file without the line "info 2". The git revert will generate conflict, and I would like to avoid manage those conflicts. That is to say doing like the commit "Commit Fix 1 on file" would have never append.

I tried revert or rebase without any luke, so if you have another idea, I will be glade to have some help.

Sincerely,

For what it's worth, kdiff3 was able to handle the "conflict" automatically without any manual intervention. I'm not sure why git can't resolve it automatically.. — PherricOxide
– PherricOxide, Commented Oct 8, 2012 at 8:41

Anshu · Accepted Answer · 2012-10-08 08:30:13Z

1

To revert a particular commit, you need to identify the hash of the commit, using git log, then use git revert <commit> to create a new commit that removes these changes.

answered Oct 8, 2012 at 8:30

Anshu

7,8635 gold badges33 silver badges41 bronze badges

Sign up to request clarification or add additional context in comments.

3 Comments

PherricOxide Over a year ago

The OP mentioned he didn't want to deal with merge conflicts though. I'm not sure why it's a conflict, but it does end up saying "error: could not revert ed0ff67... Commit Fix 1 on file hint: after resolving the conflicts, mark the corrected paths hint: with 'git add <paths>' or 'git rm <paths>' hint: and commit the result with 'git commit' "

Brownie Over a year ago

Exactly, I tried that, but the two last commits acts on the same file. So a git revert lead to a conflict that has to be treated manually. And I need to avoid this manipulation. But you are right if the commits modified two different files ...

Mark Longair Over a year ago

@Brownie: it's not that they're introducing changes to the same file, it's that the lines are adjacent in the tiny example file you're using. It's much less likely that there will be such conflicts in a real example.

xdazz · Accepted Answer · 2012-10-08 08:39:12Z

0

$ git reset HEAD^^ $ change your file to delete the info 2 $ git add . $ git commit -m "Commit Fix 2 sur file"

answered Oct 8, 2012 at 8:39

xdazz

161k38 gold badges255 silver badges278 bronze badges

1 Comment

Brownie Over a year ago

Thanks for this answer, but I don't want to manually modify files. The purpose of this is to manage fix on a software and be able to had and remove fixes easily.

Collectives™ on Stack Overflow

git revert a specific commit avoiding a merge

2 Answers 2

3 Comments

1 Comment

Hot Network Questions

Collectives™ on Stack Overflow

2 Answers 2

3 Comments

1 Comment

Related