Improve del-branch
Update git formats
Drop diff tool
Merge branch 'master' of primera.mikomi.org:dotfiles
Update install script to use a git based proxy dir to make local changes trackable
Misc updates from work laptop
Link php and pear
Change color use to 'auto' rather then all the time
Show author, not committer, in log lines-- helpful post cherrypicks/rebases
Turn on rerere and record resolution strategies for reuse later
Merge branch 'master' of primera.mikomi.org:dotfiles
Add color diff alias
Name ack correctly on debian systems
Add window toggling to tmux using the command key
Add permissions support for ssh dir