simonbingham

# use column view for `git branch`
git config --global column.ui auto

# sort by committer date when using `git branch`
git config --global branch.sort -committerdate

# reapply conflict resolution on subsequent conflict
git config --global rerere.enabled true

# less dangerous when collaborating