Vladimír Čunát 89023c38fc Recover the complicated situation after my bad merge ... I made a mistake merge. Reverting it in c778945806 undid the state on master, but now I realize it crippled the git merge mechanism. As the merge contained a mix of commits from `master..staging-next` and other commits from `staging-next..staging`, it got the `staging-next` branch into a state that was difficult to recover. I reconstructed the "desired" state of staging-next tree by: - checking out the last commit of the problematic range: 4effe769e2 - `git rebase -i --preserve-merges a8a018ddc0` - dropping the mistaken merge commit and its revert from that range (while keeping reapplication from 4effe769e2) - merging the last unaffected staging-next commit (803ca85c20) - fortunately no other commits have been pushed to staging-next yet - applying a diff on staging-next to get it into that state		2020-10-26 09:01:04 +01:00
..
documentation	man-pages: Make it findable by manpages	2020-09-29 02:08:16 +02:00
fonts	open-sans: fix revision	2020-10-24 22:05:32 +03:00
icons	luna-icons: 2020-08-09 -> 0.6	2020-10-14 11:30:18 -03:00
machine-learning/mnist	treewide: Per RFC45, remove all unquoted URLs	2020-04-10 17:54:53 +01:00
misc	Recover the complicated situation after my bad merge	2020-10-26 09:01:04 +01:00
sgml+xml	treewide: Per RFC45, remove all unquoted URLs	2020-04-10 17:54:53 +01:00
soundfonts/fluid	treewide: Per RFC45, remove all unquoted URLs	2020-04-10 17:54:53 +01:00
themes	numix-solarized-gtk-theme: 20180913 -> 20200910	2020-10-19 11:15:34 -03:00