A bare git pull wrote three-day-old code over the fix it had just fetched

Two lines of git config, both of them the sort of thing you set once and never look at again: git...