Notes

Short notes about anything that catches my attention. Also a place to save stuff I keep forgetting over and over.

08/19/2026

22:06

To rebase a branch onto a new base while preserving merge bubbles, run git rebase --rebase-merges <new-base>.

07/30/2026

18:04

To get a list of all the files changed between two points in Git history, use git diff main...<HEAD, branch-name or whatever>.

09/24/2025

14:05

When a conflict happens when rebasing a branch A on top of a branch B, what’s “mine” and what is “theirs”? VS Code uses “current change” (which would b B’s) and “incoming change” (A’s), including the commit message, which is super clear. In other tools:

  • B = “ours” or “mine” (current change)
  • A = “theirs” (incoming change)

That’s because we checkout B and then place each commit of A on top of it.

This is a hand-crafted, a little weird personal website. Create one of your own!