gitconfig

[user]
    name = Dan Lowe
    email = dan@tangledhelix.com

[alias]
    co = checkout
    ci = commit
    cm = commit -m
    st = status -s
    lol = log --pretty=oneline --abbrev-commit --graph --decorate
    # also use "lg -p"
    lg  = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit
    lgv = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --name-status
    logv = log --name-status
    unstage = reset HEAD
    aa = add .
    # Not yet added - doesn't include ignored files
    new = ls-files --others --exclude-standard
    # Files that are in the staging area
    added = diff --cached --name-only
    today = log --stat --since='1 Day Ago' --graph --pretty=oneline --abbrev-commit --date=relative
    ff = merge --ff-only
    pullsubs = submodule foreach git pull origin master
    tags = tag -l
    whichtag = !git name-rev --tags --name-only $(git rev-parse HEAD)
    branches = branch -a
    branchesbydate = !git for-each-ref --sort='-committerdate' --format='%(committerdate)  %(refname)' refs/heads | sed -e 's,refs/heads/,,'
    remotes = remote -v
    filechanges = diff --summary
    changes = diff --name-status
    wdiff = diff --word-diff
    showbranch = branch -a --contains
    id = log --pretty=format:'%H' -n 1
    hash = log --pretty=format:'%H' -n 1

[core]
    pager = less
    editor = vim
    quotepath = false
    excludesfile = ~/.gitignore

[color]
    branch = auto
    diff = auto
    interactive = auto
    status = auto
    ui = auto

[github]
    user = tangledhelix

[diff]
    # For Github-style word diffs
    wordRegex = [^[:space:]]
    tool = Kaleidoscope

[help]
    autocorrect = 1

[push]
    # Push current branch even if you've never pushed it before
    default = current

[filter "lfs"]
    clean = git-lfs clean %f
    smudge = git-lfs smudge %f
    required = true

[mergetool "Kaleidoscope"]
    cmd = /usr/local/bin/ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot
    trustexitcode = true

[merge]
    tool = Kaleidoscope

[difftool "Kaleidoscope"]
    cmd = /usr/local/bin/ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\"

[difftool]
    prompt = false

[mergetool]
    prompt = false