You didn't reverted commits, you had an "old" branch apparently and did a merge of your fix instead of a fast-forward (if you look carefully to the diffs, for instance in kis_opengl.cpp, what it seems you changed it's actually what commit f888e07e0667ce0ce289db6c2e51fd5a2a99ace2 did).
I think that unless someone wants to clean the history with the "bad git push -f" there's nothing to be done (but i'm no boss here :P). I don't know how you normally do your stuff but: 1) git checkout calligra/2.9 2) git pull (here we update calligra to the latest commits already pushed) 3) git checkout branchwithfix (branch that even before your fixes may not be in sync with calligra/2.9) 4) git pull --rebase . calligra/2.9 (put your fix/fixes on top of calligra/2.9 commits) 5) git checkout calligra/2.9 6) git merge branchwithfix 7) git push Does the trick for me when pushing fixes and when doing that merge it should say that it has been Fast-forwarded (or i think you can add a --ff-only to the git merge so that it refuses to do it if it's not a Fast forward). 2015-01-21 17:09 GMT+01:00 René J.V. <rjvber...@gmail.com>: > :-( > > Not sure what I did wrong trying to commit a point change in a single file > that I introduced a regression in, but that commit seems to have reverted a > number of changes: > > > http://quickgit.kde.org/?p=calligra.git&a=commit&h=2c40d8b87db167dd1d77341daabb2ed7837ee46b > > mea culpa, and if I knew how to correct this without messing things up > even more I'd certainly have done it already :-( > > René > _______________________________________________ > calligra-devel mailing list > calligra-devel@kde.org > https://mail.kde.org/mailman/listinfo/calligra-devel >
_______________________________________________ calligra-devel mailing list calligra-devel@kde.org https://mail.kde.org/mailman/listinfo/calligra-devel
