nixpkgs/pkgs/applications
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
..
accessibility
audio Merge pull request #101536 from kmein/feature/opustags 2020-10-24 23:39:16 +02:00
backup vorta: Fix double wrapping 2020-10-08 18:57:24 +02:00
blockchains Merge pull request #101298 from r-ryantm/auto-update/bitcoin-unlimited 2020-10-22 09:23:57 +02:00
display-managers treewide: use nix-update updateScript for packages I maintain 2020-07-29 12:33:39 -04:00
editors androidStudioPackages.{canary,dev}: 4.2.0.13 -> 4.2.0.14 2020-10-24 15:02:26 +01:00
gis Merge master into staging-next 2020-10-13 19:34:34 +02:00
graphics Revert "Merge #101508: libraw: 0.20.0 -> 0.20.2" 2020-10-25 09:41:51 +01:00
kde elisa: use libvlc 2020-09-25 10:47:43 -05:00
logging/humioctl humioctl: 0.26.1 -> 0.27.0 2020-09-25 09:44:46 +00:00
misc Revert "Merge #101508: libraw: 0.20.0 -> 0.20.2" 2020-10-25 09:41:51 +01:00
networking pkgs.nyxt: init at 2020-10-23 2020-10-25 08:56:12 +01:00
office Merge pull request #100805 from danieldk/softmaker-unlock-again 2020-10-18 10:35:38 -03:00
qubes/qubes-core-vchan-xen qubes-core-vchan-xen: 4.1.2 -> 4.1.4 2020-09-30 17:47:12 +00:00
radio Merge pull request #96511 from Zopieux/rtl_433_prom 2020-10-23 23:24:38 +02:00
science Revert "Merge #101508: libraw: 0.20.0 -> 0.20.2" 2020-10-25 09:41:51 +01:00
search recoll: qt4 -> qt5, fix build 2020-09-09 19:28:32 +02:00
system glances: 3.1.4.1 -> 3.1.5 2020-08-19 16:20:03 +02:00
version-management Recover the complicated situation after my bad merge 2020-10-26 09:01:04 +01:00
video Merge pull request #100456 from maralorn/boolToString 2020-10-25 00:45:11 +02:00
virtualization open-vm-tools: 11.1.0 -> 11.1.5 2020-10-25 09:39:40 +01:00
window-managers Merge pull request #99538 from vividn/patch-1 2020-10-21 16:06:59 +02:00