mrsaynothing.dev

> grep -r "git"▋

12 entries

Git is the version control system this blog covers hands-on: how commits leave your machine (merge vs rebase), and how revert vs reset undo them — including when reset --hard destroys work.[source]

Recurring pain points get dedicated posts: undoing the last commit with reset --soft, an undo generator for reset/revert/reflog picks, and Jujutsu's operation log as an undo model git lacks.[source][source][source]

Daily friction too: fatal: not a git repository causes, tracked files bypassing .gitignore (fixed via git rm --cached), and stashing a single file with git stash push -- <path>.[source][source][source]

see also: GitHub · CLI · version control · DevOps · AI · Linux

auto-tended from 12 posts · every sentence cites its source · mortal on purpose

2026-10-05

git merge vs rebase — decide in 10 seconds

Merge or rebase, one question decides: did the commit leave your machine? The decision table, the fast-forward case, and the reflog fix when a rebase goes wrong.

2026-09-29

Jujutsu vs Git: the Undo Button Git Never Had

jj-vcs/jj read from its public record: 31,796 stars, monthly releases, conflicts stored in history — and one operation log that out-undos git.

2026-09-28

Fatal: Not a Git Repository? The 60-Second Fix

The four real causes of fatal: not a git repository, ranked plus the one command that tells you which one you have before you touch anything.

2026-09-25

Git Undo Generator: the Exact Command for Your Mess

Answer three questions — pushed or not, keep or discard, shared or solo — and the git undo generator hands you the exact reset, revert or reflog command.

2026-09-24

My Agent Shipped a Post I Gated. It Stayed Live for a Day.

Three batch commits swept a gated post onto this live site. What broke, why globs did it, and the two checks that now run after every deploy.

2026-09-21

git stash a Single File Without Losing the Rest

Stash one file while the rest of your work stays put: git stash push -- <path>, then pop one file back out of any stash with git restore. Copy-paste commands.

2026-09-17

Gitignore Not Working? Here's the Real Fix

Gitignore not working? Tracked files bypass .gitignore. Untrack with git rm --cached, verify with git check-ignore, and stop the accidental commit loop.

2026-09-15

Git Revert vs Reset: Which One Saves Your History?

Git revert vs reset explained: which command undoes commits safely, when reset --hard destroys work, and how each rewrites shared GitHub history.

2026-09-12

Git Cherry Pick: Multiple Commits, Branches, Conflicts

Git cherry-pick explained: copy a commit from another branch, pick multiple commits or a range, fix conflicts, and know when merge or rebase fits better.

2026-09-09

Git Remove Untracked Files: Safe git clean Guide

Git remove untracked files safely with git clean: dry-run first, -fd for directories, -x for ignored files — plus why git clean isn't removing anything.

2026-09-06

Git Sync Fork With Upstream: 3 Safe Methods

git sync fork with upstream three ways: the two-command pull, a rebase for clean history, GitHub's sync button — plus fixes when your fork won't sync.

2026-09-03

Git Undo Last Commit: Keep Changes, Stay Safe

Git remove or undo the last commit and keep the changes: git reset --soft HEAD~1. Unstage with --mixed, fix a pushed commit with revert. Every verb, one page.