ff <ff@xxxxxxxxxx> writes: > I have two git branches that stem from the same exact master branch. > Many commits happened independently on these two branches overtime. > Then, I inadvertently did a merge from one branch into another. The branch > where I merged into now has mixed commits, and also a commit for the merge > itself. I then had more commits added to the branch that I merged into. > > Now I would like to revert the merge... what is the best way of doing that? > I would like very much to use something like git-revert <merge_commit_id> > But that does not seem to work. If you have published history, then the only sane option is "git revert -m". If you haven't published history, you can try "git rebase --interactive". -- Jakub Narebski Poland ShadeHawk on #git -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
