nixpkgs/pkgs/shells
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
..
any-nix-shell treewide: Per RFC45, remove all unquoted URLs 2020-04-10 17:54:53 +01:00
bash Recover the complicated situation after my bad merge 2020-10-26 09:01:04 +01:00
dash dash: 0.5.11.1 -> 0.5.11.2 2020-09-22 18:35:08 +00:00
dgsh treewide: Per RFC45, remove all unquoted URLs 2020-04-10 17:54:53 +01:00
elvish elvish: 0.14.0 -> 0.14.1 2020-08-25 12:42:02 +00:00
es treewide: Per RFC45, remove all unquoted URLs 2020-04-10 17:54:53 +01:00
fish fish: fixup awk references 2020-07-06 11:09:45 +02:00
ion buildRustPackage: remove platform.all from packages 2020-08-16 12:48:18 +10:00
jush treewide: Per RFC45, remove all unquoted URLs 2020-04-10 17:54:53 +01:00
ksh treewide: Per RFC45, remove all unquoted URLs 2020-04-10 17:54:53 +01:00
liquidprompt liquidprompt: unstable-2018-05-21 -> 1.12.0 2020-08-01 21:16:38 -03:00
mksh mksh: 59 -> 59b 2020-05-22 08:29:04 +00:00
mrsh mrsh: enable on darwin 2020-01-18 04:20:00 -05:00
nushell nushell: drop darwin workaround 2020-10-22 11:24:37 +10:00
oh oh: add missing description & homepage 2019-11-10 07:59:05 +01:00
oil oil: 0.8.pre6 -> 0.8.1 2020-10-02 08:42:23 -04:00
pash treewide: Per RFC45, remove all unquoted URLs 2020-04-10 17:54:53 +01:00
powershell powershell: 7.0.1 -> 7.0.3 2020-10-08 15:08:12 -04:00
rc treewide: Per RFC45, remove all unquoted URLs 2020-04-10 17:54:53 +01:00
rush treewide: Per RFC45, remove all unquoted URLs 2020-04-10 17:54:53 +01:00
tcsh treewide: fix broken AlpineLinux repo links (#87892) 2020-05-15 16:58:27 +01:00
xonsh xonsh: 0.9.22 -> 0.9.23 2020-10-10 00:27:53 +02:00
zsh zsh-powerlevel10k: 1.12.0 -> 1.13.0 2020-10-22 19:49:18 +02:00