!rGlCMuXgAhgEpdvJUz:nixos.org

NixOS KDE

204 Members
56 Servers

Load older messages


SenderMessageTime
3 Aug 2025
@k900:0upti.meK900Are you sure you want this17:50:19
@k900:0upti.meK900Because I am not17:50:21
@emilazy:matrix.orgemily I like it a lot more than breaking git blame/git log forever on the installer stuff 17:53:40
@emilazy:matrix.orgemily --first-parent hides it all anyway 17:53:47
@emilazy:matrix.orgemilyI would give the subtree commit a less horrible description though :P17:54:03
@emilazy:matrix.orgemilysince we're presumably never going to sync again17:54:07
@emilazy:matrix.orgemily it's also a lot easier to review 3fb37bb7c31a7664c319a3698781820cbe16397c now 17:54:36
@emilazy:matrix.orgemily (having to check multiple repositories for yarn2nix relicensing was awful too) 17:54:54
@k900:0upti.meK900 Git didn't ask 17:55:21
@emilazy:matrix.orgemilyyou have the power to modify commits 🪄17:55:36
@emilazy:matrix.orgemilywe can definitely remove like, the flake and stuff though too of course17:55:41
@emilazy:matrix.orgemilyI do like the new unfree wording also.17:56:04
@k900:0upti.meK900 If I as much as touch that commit it blows up 17:56:24
@k900:0upti.meK900Massively17:56:26
@k900:0upti.meK900 I did remove that just now 17:56:34
@emilazy:matrix.orgemilyuh17:56:34
@emilazy:matrix.orgemilyhow?17:56:35
@k900:0upti.meK900idk subtrees17:56:40
@emilazy:matrix.orgemilyit's just a merge commit17:56:41
@k900:0upti.meK900If you want to exorcise it feel free to push17:56:50
@emilazy:matrix.orgemily you can just reword it 17:56:50
@k900:0upti.meK900Maybe jj can fix it17:56:53
@emilazy:matrix.orgemilyGit can fix it too :P but sure, I'll look at it later17:57:07
@k900:0upti.meK900I'm sure it can but I'm also sure I don't want to figure out how17:57:19
@emilazy:matrix.orgemily is the problem that you are rebasing without --rebase-merges 17:57:39
@emilazy:matrix.orgemilybecause yes that is a thing Git is very stupid about17:57:47
@k900:0upti.meK900OK yes I thought I had it in my config17:58:42
@k900:0upti.meK900But I guess I don't17:58:42
@k900:0upti.meK900Also I just looked at the history and there's like 10 people that need to sign off to just make the whole thing MIT18:11:15
@k900:0upti.meK900So I'm gonna try that18:11:19

Show newer messages


Back to Room ListRoom Version: 9