I’m not sure if you’re misunderstanding who you’re replying to, or if I’m misunderstanding you in this reply, but I don’t think they’re saying “all gamers are incels who don’t like girls”, I think they’re saying “all the shitty people reacting poorly are the remaining socially inept incel guys”

I don’t remember this chapter of the Obra Dinn…

Right, but what I’m saying is that git doesn’t store authorship information or line-by-line history, no matter how it’s done. Figuring out which line came from where is an algorithm the git blame command does every time you request it, and that algorithm can give different results depending on which options you give the blame command. And so what you’ve found here is a collection of commits that produces a situation the default blame algorithm can follow, without any optional flags, which is neat! Maybe not great for git history, but neat!

I am not aware of this setup, and so I’m musing and winging it, but I think what they’re saying is that if you point at the paper and say “is this a sheet of paper” they’d say yes. And then you point to the crease and say “is this a crease” and they’d say yes, so it has identity, separate from the paper (as in creases and papers are not synonymous), but given that it’s not counted when listing things in the room, it’s also not a thing.

But I think for me it’s not that tricky, because it’s a feature of the paper. Like if there was a coat in the room with buttons, and you asked me what was in the room I wouldn’t say a coat and three buttons, I’d say just a coat. And the coat has three buttons, but those are properties of the coat, not the room. And buttons are something that can stand-alone!

But if I had a sheet of paper with a button placed in the middle of it, but not attached, I wonder would most people say it was a sheet of paper and a button, or a sheet of paper with a button?

And that was after this scene

Interesting. Yeah, sounds like what git blame -C is for, so I’ve never made copies when splitting files, I’ve just moved lines between files naively. But I guess if one’s tools are limited and doesn’t have the ability to -C, then I guess I could respect the hack that is that solution?

I mean, I’m 99% sure git doesn’t store blame or authorship info in the pack files, even as a convenience cache, and just guesses by traversing the patch log with heuristics live when you run blame anyway, so the history mostly doesn’t matter there, but the way you’ve done it does seem to have tricked the heuristics into doing what you want without relying on an option, so that’s neat! It’s an interesting hack, and I like interesting hacks 😛

By the way, if there are down votes, they’re not from me!

Yeah, I’m with you. I mean, git isn’t magic. You “can” squash anything, including a merge commit, by just being at the end result, running git reset <commit you want to be squashed off of> and then running a manual git add and commit there. That’s basically all a squash is.

But what you’ll be left with us a single commit that contains all of the code from the branch you’re squashing and also all the code pulled in from every branch you merged, all written as though it all came from this one commit. And maybe that’s what you want? But it feels like also maybe it’s not?

Right… for sure… but then if you don’t want to squash, then it doesn’t matter you can’t squash a merge commit.

Huh. I have never in my 19 year career using git, ever wanted to copy a file and pretend all of the history of that file is also the history of the new file. I mean, I don’t think I’ve ever even wanted to copy a file? Why are you copying a file?

Like, maybe I’m just too familiar with git to see the forest for the trees, but what the heck are you doing over there? 😅

And just in case it’s useful, a tip is that you can use git blame -C to have the blame algorithm use a heuristic to try and find a “source” line if it was moved, including from another file, during a commit, and then continue following the history of that line, to try and get the real commit where this was written, not just the last time it was moved around.

It really is a testament to the strength of Nintendo’s (and Game Freak’s) brand and characters that they can have so many fans, making so much awesome fan art and content, all while being the absolutely most abusive and toxic to those fans and artists.

Like, most creators and franchises would kill for a community to spring up, or for people to engage with their work outside of their work. They’d consider it free advertising, and in fact they sometimes even pay for contests and things like that to drum up some kind of fan community and momentum.

And then Nintendo is out here hunting momentum and affection wherever they can find it, and it keeps springing up despite that 😛

Doesn’t really look like an attack to me. He’s just chillin!

I love the timing of this post, being right after the “I just had my first 3some” one. I like to imagine you finish getting plowed and being like “wow, that was amazing”, and then one of the guys being like “oh, you think that was amazing? You know what’s amazing is these pandas with bucket on their heads” and then the other guy being like “yo, after that there’s this great video I’ve got to show you” and squishing you in the middle and you’re like “nooooooooooo…”

Since Linux 5.2 you can actually make the (ext4) filesystem case-insensitive, per directory. If you’re into that kind of thing.