nixpkgs/doc
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
..
builders doc: Use mesa.drivers instead of legacy alias 2020-10-18 00:58:09 +02:00
contributing doc: Improve code listings 2020-09-23 01:25:25 +02:00
doc-support doc: organize chapters into parts, and reduce toc depth 2019-10-20 13:35:04 +02:00
functions Merge pull request #68491 from roberth/fix-dontRecurseIntoAttrs 2020-03-01 11:05:34 +01:00
languages-frameworks The Haskell documentation has moved to <https://haskell4nix.readthedocs.io/>. 2020-10-23 21:00:26 +02:00
old doc/*: editorconfig fixes 2020-07-31 15:06:53 +10:00
stdenv Recover the complicated situation after my bad merge 2020-10-26 09:01:04 +01:00
using doc: Improve code listings 2020-09-23 01:25:25 +02:00
.gitignore doc: format the documentation (#57102) 2019-03-08 21:07:11 -08:00
default.nix doc: move parameters to an XML file 2019-07-04 09:16:06 -04:00
functions.xml doc: move fhs and mkShell under builders/special 2019-10-21 11:39:46 +02:00
Makefile doc: fix MD_TARGETS 2020-07-18 14:23:25 +09:00
manual.xml doc: rename guide to 'Nixpkgs Manual' 2020-09-24 14:07:25 +02:00
overrides.css doc: Make callout marks in code unselectable 2020-01-14 15:24:57 +01:00
preface.chapter.md treewide: use https for nixos.org and hydra.nixos.org 2020-05-03 22:14:21 -07:00
release-notes.xml treewide: use https for nixos.org and hydra.nixos.org 2020-05-03 22:14:21 -07:00
shell.nix Generate links to function definitions 2018-10-05 11:20:46 -04:00
style.css manual: limit text width 2019-01-08 15:08:42 +00:00