While trying to revert a commit I made to my repository of my .emacs.d
folder I get the following message:

haziz@haziz> git revert 7fe3f

error: could not revert 7fe3f0b... .emacs.d contents from ubuntu hp 15
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'
What I am trying to do is reverse changes I made to my init.el file
and have followed with another commit which I am trying to reverse. I
would prefer to revert rather than reset --hard since as far as I know
the latter completely erases the most recent commit. I would like to
create a new commit so that I can possibly "revert" the revert.

In other words what I am trying to do is this

Git Commits [A]...[B]
would be reverted to

Git Commits [A]...[B]...[A']
Am I doing something wrong?

After that I tried doing a diff/merge as best as I could then another
commit but then it still gives me this new error message:

haziz@haziz> git revert 7fe3f0ba3182b591f11c0b59e006dc6c990b7470

fatal: Your local changes would be overwritten by revert.
Please, commit your changes or stash them to proceed.
How do I tell it to ignore (but not delete) unstaged files, without
resorting to a .gitigore file. I frankly don't care about most of the
unstaged files which are emacs temp files etc.

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To post to this group, send email to git-users@googlegroups.com.
To unsubscribe from this group, send email to 
git-users+unsubscr...@googlegroups.com.
For more options, visit this group at 
http://groups.google.com/group/git-users?hl=en.

Reply via email to