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
..
darwin/dri/GL/internal
.gitignore
builder.sh
default.nix	Recover the complicated situation after my bad merge	2020-10-26 09:01:04 +01:00
fix-uninitialised-memory.patch
generate-expr-from-tarballs.pl	generate-expr-from-tarballs.pl: fix insecure temporary file	2020-09-30 09:21:55 +00:00
imake-cc-wrapper-uberhack.patch
imake-setup-hook.sh
imake.patch
imake.sh
overrides.nix	Recover the complicated situation after my bad merge	2020-10-26 09:01:04 +01:00
tarballs.list	Recover the complicated situation after my bad merge	2020-10-26 09:01:04 +01:00
xcb-util-xrm.nix
xwayland.nix	nixos/xwayland: add new module and allow configuring a default font path	2020-10-04 14:56:30 +01:00