[Mixxx-devel] git revert merge

2013-06-21 Thread Max Linke
Hi I want to revert a merge that I made accidently and already pushed to mit github repo. So rewriting history with 'git reset --hard HEAD' might cause some trouble. I found that git revert -m should to what I want but I haven't found a way yet to determine the parent number. Here is the lo

Re: [Mixxx-devel] git revert merge

2013-06-21 Thread Mina Nagy Zaki
On Fri, 21 Jun 2013 23:45:45 +0200, Max Linke wrote: > Hi > > I want to revert a merge that I made accidently and already pushed to > mit github repo. So rewriting history with 'git reset --hard HEAD' > might cause some trouble. I found that > > git revert -m > > should to what I want but I h

Re: [Mixxx-devel] git revert merge

2013-06-22 Thread Owen Williams
Usually a git-revert command applies a new commit that is equivalent to the opposite of the merge you didn't want. If you actually want to rewind history, which can be DANGEROUS, do the following: DANGER DANGER: git reset --hard [SHA YOU WANT TO BE AT] note that this will reset your tree to that