| fsmithred | I'm lost in git hell in release-docs. I did a checkout -b wip/daedalus, edited the README_minimal-live.txt and tried to push. Now I have a choice of three commands that I don't understand. If I had a faster connection, I'd just re-download the whole documentation repo, but that'll take till tomorrow. | 01:06 |
|---|---|---|
| fsmithred | hint: git config pull.rebase false # merge | 01:07 |
| fsmithred | hint: git config pull.rebase true # rebase | 01:07 |
| fsmithred | hint: git config pull.ff only # fast-forward only | 01:07 |
| bb|hcb | That is a git setting, it does not come from the repo | 01:11 |
| bb|hcb | just type this: "git config pull.rebase false" | 01:11 |
| fsmithred | ok, thanks | 01:11 |
| fsmithred | yay, that worked. Thanks. | 01:16 |
| Xenguy | There's a special place in hell for... git hell | 04:48 |
| LeePen | golinux: thanks. Yes, they are both level 2 headings (it is a markdown file), as indicated in the Index. | 08:09 |
| LeePen | What do you suggest? | 08:09 |
| LeePen | I have just build elogind 252.9-1~rc1 for experimental. | 13:37 |
| LeePen | It represents a major update, so please test thoroughly in a non-critical environment. | 13:37 |
| LeePen | (It works fine for me in a VM). | 13:37 |
| LeePen | There is a new consolekit version coming shortly as well, once the docs are sorted: https://github.com/ConsoleKit2/ConsoleKit2/issues/133 | 13:39 |
| LeePen | Before anybody asks, neither will go in Daedalus ;) | 13:40 |
| clemens3 | golinux: borrowed your art (I think it's yours) for the tinux distro grub screen: http://techinvest.li/tinux/images/screenshot_tinux_grub_800x600.jpg | 16:18 |
| golinux | clemens3: It is there for anyone to use. :) Actually hellekin did the graphics many years ago and I do (or used to do - now "retired") the colors.; | 16:24 |
| golinux | LeePen: So eventually there will be content under "Notes on Specific Packages and Issues"? I completely missed thinking of that option because I was paying attention to visuals rahter than content. | 16:30 |
| golinux | Sorry for the noise . . . | 16:31 |
| clemens3 | golinux: cool! like the blue.. | 16:39 |
| LeePen | golinux: Yes, or if there aren't any, that heading can be removed. | 19:17 |
| golinux | LeePen: A TBA placeholder for that content would have made that perfectly clear. ;) My old brain needs all the help it can get! | 19:50 |
| bgstack15 | Devuan meet tomorrow, Thursday, May 25, at 20:30 UTC. Pad is here: https://pad.dyne.org/code/#/2/code/edit/uLguGq00BnLCnd6h3Mz9EqPx/ | 21:12 |
Generated by irclog2html.py 2.17.0 by Marius Gedminas - find it at https://mg.pov.lt/irclog2html/!
