Some notes on nix flakes
I’ve been using nix for about 9 months now. For all of that time I’ve been steadfastly ignoring flakes, but everyone keeps saying that flakes are great and the best …
Julia Evans
How git cherry-pick and revert use 3-way merge
Hello! I was trying to explain to someone how git cherry-pick works the other day, and I found myself getting confused. What went wrong was: I thought that git cherry-pick …
git rebase: what can go wrong?
Hello! While talking with folks about Git, I’ve been seeing a comment over and over to the effect of “I hate rebase”. People seemed to feel pretty strongly about this, …
Confusing git terminology
Hello! I’m slowly working on explaining git. One of my biggest problems is that after almost 15 years of using git, I’ve become very used to git’s idiosyncracies and it’s …
Some miscellaneous git facts
I’ve been very slowly working on writing about how Git works. I thought I already knew Git pretty well, but as usual when I try to explain something I’ve been …
New talk: Making Hard Things Easy
A few weeks ago I gave a keynote at Strange Loop called Making Hard Things Easy. It’s about why I think some things are hard to learn and ideas for …
In a git repository, where do your files live?
Hello! I was talking to a friend about how git works today, and we got onto the topic – where does git store your files? We know that it’s in …