Creating a git commit from scratch. Covers blob, tree, and commit.

I always confuse the concept of ours and theirs. Every time I have to choose one I need to search which is which. Turns out I'm not alone! This website explains what each term refers to. TL;DR: the currently checked out branch is "ours" in merge, but "theirs" in rebase.

A great way of managing system level dotfiles. TL;DR:

alias dotfiles='git --git-dir=/home/mx/.dotfiles --work-tree=/'
dotfiles config --local status.showUntrackedFiles no

Then managing the files would be simple basic git operations. No symlinking, installation, synchronization, etc.

Alternatively, it's also sensible to set the worktree to $HOME.

Or, how to specify different git config (name, email, sign key) for projects under different directories.

In short, after you finished your feature branch, reset the branch against master and re-create commit history based on logical groups.

<blockquote>GitExplorer: Find the right git commands you need without digging through the web</blockquote>