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
..
cc-wrapper	stdenv: make -nostdinc work as intended	2020-07-23 08:39:46 +01:00
cross	pkg-config-wrapper: Init	2020-05-16 00:21:21 +00:00
haskell-shellFor	tests.haskell-shellFor: get compiling again	2020-09-25 21:08:23 +02:00
install-shell-files	Recover the complicated situation after my bad merge	2020-10-26 09:01:04 +01:00
ld-library-path	pkgs/tests: Add test for LD_LIBRARY_PATH	2018-08-01 19:02:21 +03:00
macos-sierra-shared	treewide: remove redundant rec	2019-08-28 11:07:32 +00:00
mkOption
nixos-functions	tests.nixos-functions: port test to python	2020-02-09 23:53:58 +01:00
patch-shebangs	treewide: use dontUnpack	2019-07-01 04:23:51 -04:00
simple
stdenv-inputs	treewide: use dontUnpack	2019-07-01 04:23:51 -04:00
texlive	tests.texlive: init	2020-10-06 19:24:41 -04:00
default.nix	Recover the complicated situation after my bad merge	2020-10-26 09:01:04 +01:00
kernel.nix	kernel: fix config generation	2020-04-01 22:25:57 +02:00