On Fri, 21 Jun 2013 23:45:45 +0200, Max Linke <max_li...@gmx.de> 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 <parent-number> <commit> > > should to what I want but I haven't found a way yet to determine the > parent number. > > Here is the log for that branch, I want to revert to 93f2183199bbc9ff > [..] > commit 5901cc3e5833111309e8ca2ec0e8115d0f5b4a38 > Merge: 93f2183 e28c83b > Author: Max Linke <kai...@mixxx.org> > Date: Fri Jun 21 16:29:21 2013 +0200 > > Merge remote-tracking branch 'origin/multiplyFolders' into > mb_errorMessage I'm assuming this is the merge you want to revert. It has two parents listed in the 'Merge:' field. The first parent was the HEAD during your merge (the 'us') and the second parent is the branch you merged into it (the 'them') You want to keep 93f218, that's parent number 1. So: git revert -m 1 5901cc3e5833111309e8ca2ec0e8115d0f5b4a38 -- This was Mina Nagy Zaki. End of Transmission. ------------------------------------------------------------------------------ This SF.net email is sponsored by Windows: Build for Windows Store. http://p.sf.net/sfu/windows-dev2dev _______________________________________________ Get Mixxx, the #1 Free MP3 DJ Mixing software Today http://mixxx.org Mixxx-devel mailing list Mixxx-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/mixxx-devel
