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
..
wrap-gapps-hook	wrapGAppsHook: add comments	2020-07-24 00:36:12 +02:00
audit-blas.sh
audit-tmpdir.sh
auto-patchelf.sh	add autoPatchelfIgnoreMissingDeps to auto-patchelf.sh	2020-06-22 10:41:35 +02:00
autoreconf.sh
breakpoint-hook.sh
compress-man-pages.sh
die.sh
enable-coverage-instrumentation.sh
find-xml-catalogs.sh
fix-darwin-dylib-names.sh
gog-unpack.sh
install-shell-files.sh	Recover the complicated situation after my bad merge	2020-10-26 09:01:04 +01:00
keep-build-tree.sh
ld-is-cc-hook.sh
make-coverage-analysis-report.sh
make-symlinks-relative.sh
make-wrapper.sh
move-docs.sh
move-lib64.sh
move-sbin.sh
move-systemd-user-units.sh	hooks: add moveSystemdUserUnitsHook	2020-09-12 18:29:46 +02:00
multiple-outputs.sh	stdenv: fix backward multiple outputs conditional	2020-06-29 13:56:27 +00:00
patch-shebangs.sh
prune-libtool-files.sh
role.bash
separate-debug-info.sh
set-java-classpath.sh
set-source-date-epoch-to-latest.sh
setup-debug-info-dirs.sh
shorten-perl-shebang.sh
strip.sh
update-autotools-gnu-config-scripts.sh
use-old-cxx-abi.sh
validate-pkg-config.sh	validatePkgConfig: fix variable scope	2020-10-18 14:00:05 +02:00
win-dll-link.sh