[include]

path = ./gitconfig.local

[alias]

# Every day shortcuts

st = status

cm = commit

br = branch --sort=committerdate

co = checkout

sw = switch

rs = restore

cp = cherry-pick

m = merge

rb = rebase

df = diff

dt = difftool

mt = mergetool

del = br -d

delete = br -d

fd = br -D

force-delete = br -D

unstage = reset HEAD

us = unstage

pull-current = "!git pull origin $(git branch-name)"

pc = pull-current

new-branch = checkout -b

new = new-branch

# Rebase utils

pr = pull --rebase

rbs = rebase --skip

rbc = rebase --continue

rba = rebase --abort

# General utils

branch-name = rev-parse --abbrev-ref HEAD # current branch name

unpublish = "!git push origin :$(git branch-name)"

cleanup = !git remote prune origin && git gc && git stash clear

deploy-heroku = push heroku master # for heroku apps

# Logging

lg = log -20 --pretty=format:'%C(brightred)%h%C(reset) %x2D %s %C(brightgreen)(%cd)%Creset %C(brightblue)<%an>%Creset' --date=relative --reverse --abbrev-commit

lg-graph = log --graph --decorate --pretty=oneline --abbrev-commit --all

[push]

default = current

[merge]

tool = Kaleidoscope

[mergetool "diffmerge"]

cmd = diffmerge --merge\n--result=$MERGED $LOCAL $BASE $REMOTE

trustExitCode = true

[mergetool "Kaleidoscope"]

cmd = ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot

trustExitCode = true

[mergetool]

prompt = false

[diff]

tool = Kaleidoscope

[color]

ui = true

[color "diff"]

meta = blue black bold

[color "status"]

meta = blue black bold

[core]

excludesfile = /Users/ross/.gitignore_global

autocrlf = input

[difftool "Kaleidoscope"]

cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\"

[difftool]

prompt = false

[filter "lfs"]

clean = git-lfs clean -- %f

smudge = git-lfs smudge -- %f

required = true

process = git-lfs filter-process

[user]

name = Ross Noble

email = rnoble@fastmail.com

[pull]

rebase = true