Tagged “git”

Note that during git rebase and git pull --rebase, ours and theirs may appear swapped; --ours gives the version from the branch the changes are rebased onto, while --theirs gives the version from the branch that holds your work that is being rebased.

git is so stupid sometimes

testing

Generally agree. Mainly tracking file creation/history gets a bit annoying (especially when files are moved/renamed/split up). But most of the time I don't think it particularly matters.

Also some good tips like ingorerevs in hackernews comments.

An insanely sensible idea! Some choice quotes in the intro illustrate the problem (and a common one with git..):

Git is a version control system with robust underlying principles, and yet, novice users are terrified of it. When they make a mistake, many would rather delete and re-clone the repository than try to fix it.

Why? How is it so easy to “lose” your data in a system that’s supposed to never lose your data?

Well, it’s not that it’s too easy to lose your data — but rather, that it’s too difficult to recover it.

Sorry for rushing this a bit, but got home yet?

Wanted to remove a bunch of old/unused binary files that were bloating a repo.

Refreshingly professional. My usual favourite commits are either Developers Swearing or awful puns.