I think the git reset way is conceptually the easiest, just combine it with cherrypick if needed:
git reset --hard [last-good-sha1] # go back in history git cherry-pick [sha1-of-commit-to-add] # apply commit that you want to preserve ... repeat as needed ... git push --force # overwrite whats on the remote On Saturday, November 24, 2018 at 1:14:49 PM UTC+1, Timo Kaufmann wrote: > > Another (more destructive) way is to use `git reset --hard <commit>` to > reset the current branch to a particular commit and then `git push --force` > it to trac. Another option is `git rebase --interactive`. > > Am Samstag, 24. November 2018 12:41:36 UTC+1 schrieb Friedrich Wiemer: >> >> In https://trac.sagemath.org/ticket/25742#comment:13 I accidentally >> merged the ticket branch forom #25766 >> <https://trac.sagemath.org/ticket/25766>. >> Can someone help and tell me how to undo this? :/ >> > -- You received this message because you are subscribed to the Google Groups "sage-devel" group. To unsubscribe from this group and stop receiving emails from it, send an email to sage-devel+unsubscr...@googlegroups.com. To post to this group, send email to sage-devel@googlegroups.com. Visit this group at https://groups.google.com/group/sage-devel. For more options, visit https://groups.google.com/d/optout.
