gitconfig

[alias]
	co = checkout
	st = status -sb
	ci = commit
	br = branch
	lg = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr)%Creset %Cblue[%cN]%Creset' --abbrev-commit --date=relative
	ls = log --all --pretty=format:'%C(red)%ad %C(reset)[%cN]%C(magenta)%d%C(reset) %s%C(reset)' --abbrev-commit --since=2.weeks --date="local" -30
	logc = log --graph --pretty=format:'%C(yellow)commit %h %Creset(%cr)%nAuthor: %C(green)%aN <%aE>%Creset%n%n %Cblue%s%Creset%n '
	wdiff = diff --color-words
	clone = clone --recursive
	branches = branch -a -vv
	current-branch = !git branch | grep '^*' | sed s/\\*\\ //
	track = !git branch --set-upstream $(git current-branch) origin/$(git current-branch)
	hist = log --pretty=format:\"%h %ad | %s%d [%an]\" --graph --date=short
	type = cat-file -t
	dump = cat-file -p
	unpushed = !GIT_CURRENT_BRANCH=$(git name-rev --name-only HEAD) && git log origin/$GIT_CURRENT_BRANCH..$GIT_CURRENT_BRANCH --oneline
	sm = submodule foreach
	modules = submodule foreach git pull origin master
	count = !git shortlog -n $@ | grep \"):\" | sed \"s|:||\"
	ksreview = "!f() { local SHA=${1:-HEAD}; local BRANCH=${2:-master}; if [ $SHA == $BRANCH ]; then SHA=HEAD; fi; git difftool -y -t Kaleidoscope $BRANCH...$SHA; }; f"
	conflicts = !git ls-files --unmerged | cut -c51- | sort -u | xargs $EDITOR
	sup = "submodule foreach 'git checkout master; git pull'"
	update = !git commit --amend --date=\"$(date)\"

[color "branch"]
	current = yellow reverse
	local = yellow
	remote = green

[color "status"]
	added = yellow
	changed = green
	untracked = cyan

[color "diff"]
	whitespace = red reverse
	meta = yellow bold
	frag = magenta bold
	old = red
	new = green

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

[merge]
	tool = Kaleidoscope
	stat = true

[mergetool "mvim"]
	cmd=mvim -d -g $LOCAL $MERGED $REMOTE
	keepbackup=false

[core]
	excludesfile = ~/.gitignore
	whitespace=fix,-indent-with-non-tab,trailing-space,cr-at-eol

[apply]
	whitespace = fix

[help]
	autocorrect = 1

[branch]
	autosetuprebase = always

[push]
	default = tracking

[difftool]
	prompt = false

[diff]
	tool = Kaleidoscope
	renames = copies
	mnemonicprefix = true

[difftool "Changes"]
	cmd = chdiff \"$LOCAL\" \"$REMOTE\"
[difftool "Kaleidoscope"]
	cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\"
[difftool "mvim"]
	cmd = mvim -d \"$LOCAL\" \"$REMOTE\"
[get]
	recurseSubmodules = always
[mergetool "Kaleidoscope"]
	cmd = ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot
	trustExitCode = true
[mergetool]
	prompt = false

[include]
  path = ~/.gitconfig.local