git on Maëlle Salmon's personal website

git on Maëlle Salmon's personal website https://masalmon.eu/tags/git/ Recent content in git on Maëlle Salmon's personal website Hugo -- gohugo.io en-us Licence: <a href="https://creativecommons.org/licenses/by-sa/2.0/">CC BY-SA</a> Tue, 19 May 2026 00:00:00 +0000 More crochet/programming thoughts https://masalmon.eu/2026/05/19/crochet-again/ Tue, 19 May 2026 00:00:00 +0000 https://masalmon.eu/2026/05/19/crochet-again/ Here I am again, writing about crochet and programming! I’ve continued creating my tons of shitty stitches cute creatures. New Git analogy! The crochet lifeline First Git/crochet analogy. I read a great crochet book about creating your own amigurumi patterns: Créer ses propres modèles d’amigurumis au crochet by Clotilde Massot and Lise Grandjonc. One of its authors (Clotilde Massot) is a software developer who, among other things, published an octocat pattern that I bought and used… Anyway in the book they explain that when you create a pattern, you will probably have to undo your work several times. Git worktrees are now cool https://masalmon.eu/2026/04/23/git-worktree-again/ Thu, 23 Apr 2026 00:00:00 +0000 https://masalmon.eu/2026/04/23/git-worktree-again/ I’m not mad when current AI tools or tips1 make Git look cool and important. Something old and stable to cling to! 🤗 In particular, it’s now trendy to have agents work on different tickets in the same project in parallel by using Git worktrees. Git worktrees are even useful for us humans, even if we should probably not work on a dozen things at the same time. I had learnt about Git worktrees a while ago, but only viewed them as a way to open a read-only view of a past version of a repository: I have written about loading different R package versions at once with git worktree. Better Git diff with difftastic https://masalmon.eu/2026/03/30/difftastic/ Mon, 30 Mar 2026 00:00:00 +0000 https://masalmon.eu/2026/03/30/difftastic/ I’m currently on a quest to better know and understand treesitter-based tooling for R. To make it short, treesitter is a tool for parsing code, for instance recognizing what is a function, an argument, a logical in a string of code. With tools built upon treesitter you can search, reformat, lint and fix, etc. your code. Exciting stuff, running locally and deterministically on your machine. Speaking of “etc.”, Etienne Bacher helpfully suggested I also look at treesitter-based tooling for other languages to see what’s still missing in our ecosystem. Zut, Git ! Porting {saperlipopette} to the terminal with Claude https://masalmon.eu/2026/02/27/zut-saperlipopette-claude/ Fri, 27 Feb 2026 00:00:00 +0000 https://masalmon.eu/2026/02/27/zut-saperlipopette-claude/ A while ago, I decided to learn some Rust. I bought a book, opened it months later and started a small side-project: porting my R package saperlipopette to the terminal by writing a CLI with Rust. I then lost steam and discarded the project. Now, teaching more Git with saperlipopette has me itching to do the same outside of R, to reach more learners. And in the meantime, even though I have conflicting feelings about it, I realized that using an LLM, specifically Claude Code (Opus 4. Git commits: please mark your stitches! https://masalmon.eu/2026/02/15/stitch-markers-git-commits/ Sun, 15 Feb 2026 00:00:00 +0000 https://masalmon.eu/2026/02/15/stitch-markers-git-commits/ In which I share a crochet analogy for Git commits… This post was featured on the R Weekly highlights podcast hosted by Eric Nantz and Mike Thomas. Don’t forget your stitch markers! I am happily continuing my crochet learning journey. One lesson I have now internalised is that I should never ever forget or neglect to use stitch markers. Stitch markers are sort of small, not spiky, safety pins. A crochet project featuring several stitch markers (beginning of a Snorlax from Lee Sartori’s Pokemon crochet book) Does my test really validate a bug fix? Check it with git cherry-pick https://masalmon.eu/2024/08/29/cherrypick-test/ Thu, 29 Aug 2024 00:00:00 +0000 https://masalmon.eu/2024/08/29/cherrypick-test/ Earlier this year I wrote a post about git worktree that allows you to load different versions of an R package at once on your computer. To keep with the “juggle between versions of a codebase with Git plant-related commands” theme, let me show you how I use cherry-pick to assess the quality of an unit test. Scenario: you fix a bug in a branch In a perfect world, the bug you’re working on is paired with a ✨ reprex ✨, and you even start your work by adding a test case for it. Hack your way to a good Git history https://masalmon.eu/2024/06/11/rewrite-git-history/ Tue, 11 Jun 2024 00:00:00 +0000 https://masalmon.eu/2024/06/11/rewrite-git-history/ I’ve now explained on this blog why it’s important to have small, informative Git commits1 and how I’ve realized that polishing history can happen in a second phase of work in a branch. However, I’ve more or less glossed over how to craft the history in a branch once you’re done with the work. I’ve entitled this post “Hack your way to a good Git history” because writing the history after the fact can feel like cheating, but it’s not! Why you need small, informative Git commits https://masalmon.eu/2024/06/03/small-commits/ Mon, 03 Jun 2024 00:00:00 +0000 https://masalmon.eu/2024/06/03/small-commits/ This post was featured on the R Weekly highlights podcast hosted by Eric Nantz and Mike Thomas. “Make small Git commits with informative messages” is a piece of advice we hear a lot when learning Git. That’s why we might want to sometimes rewrite history in a branch. In this post, I’d like to underline three main (😉) reasons why you’ll be happy you, or someone else, made small and informative Git commits in a codebase. Load different R package versions at once with git worktree https://masalmon.eu/2024/01/23/git-worktree/ Tue, 23 Jan 2024 00:00:00 +0000 https://masalmon.eu/2024/01/23/git-worktree/ This post was featured on the R Weekly highlights podcast hosted by Eric Nantz and Mike Thomas. Do you ever see GitHub issue comments where someone posts the results of a reprex with a current package version, and then with an older one, to prove a regression? How would you go about preparing such a report? Today I learnt there is a clean way to have different versions of a codebase at once on your computer, thanks to the ever powerful Git. Reading notes on Pro Git by Scott Chacon https://masalmon.eu/2024/01/19/pro-git-scott-chacon-reading-notes/ Fri, 19 Jan 2024 00:00:00 +0000 https://masalmon.eu/2024/01/19/pro-git-scott-chacon-reading-notes/ As mentioned about a million times on this blog, last year I read Git in practice by Mike McQuaid and it changed my life – not only giving me bragging rights about the reading itself. 😅 I decided to give Pro Git by Scott Chacon a go too. It is listed in the resources section of the excellent “Happy Git with R” by Jenny Bryan, Jim Hester and others. For unclear reasons I bought the first edition instead of the second one.