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
..
bash-completion	Recover the complicated situation after my bad merge	2020-10-26 09:01:04 +01:00
nix-bash-completions
4.4.nix	treewide: add warning comment to “boot” packages	2020-07-31 08:56:53 +02:00
5.0.nix
bash-4.4-patches.nix
bash-5.0-patches.nix	bash: 5.0p17 -> 5.0p18	2020-10-15 19:40:53 -04:00
cygwin-bash-4.4.11-2.src.patch
pgrp-pipe-4.4.patch
pgrp-pipe-5.0.patch
update-patch-set.sh	bash: Use nix-shell in update script	2020-10-15 19:34:49 -04:00