nixpkgs/pkgs/development/interpreters/ruby
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
..
rubygems Recover the complicated situation after my bad merge 2020-10-26 09:01:04 +01:00
config.nix
default.nix ruby: fix build on darwin 2020-10-22 04:20:00 +00:00
dev.nix ruby: Fix evaluation error 2016-08-31 21:13:12 +03:00
patchsets.nix ruby_2_7: 2.7.1 -> 2.7.2 2020-10-06 09:45:39 +02:00
rbconfig.rb ruby: install ri docs to devdoc output 2019-05-07 17:08:08 +00:00
ruby-version.nix ruby: fixes rubygems user installs 2016-10-02 22:07:22 +01:00
rvm-patchsets.nix ruby: update RVM patchsets 2020-10-06 09:45:39 +02:00