gitconfig

# vim: noexpandtab : set ft=gitconfig:
[color]
	status = auto
	diff = auto
	branch = auto

[core]
	editor = code --wait
	excludesfile = ~/.gitignore
	# Treat spaces before tabs and all kinds of trailing whitespace as an error
	# [default] trailing-space: looks for spaces at the end of a line
	# [default] space-before-tab: looks for spaces before tabs at the beginning of a line
	whitespace = space-before-tab,-indent-with-non-tab,trailing-space

[mergetool]
	keepBackup = true

[merge]
	ff = only
	tool = vimdiff
	defaultToUpstream = true
	# Include summaries of merged commits in newly created merge commit messages
	log = true

[push]
	default = simple

[pull]
	rebase = true

[filter "media"]
	clean = git-media-clean %f
	smudge = git-media-smudge %f

[apply]
	# Detect whitespace errors when applying a patch
	whitespace = fix

[alias]
	serve = daemon --reuseaddr --verbose --base-path=. --export-all ./.git

	dog = log --all --decorate --oneline --graph
	glog = log --all --pretty='format:%d %Cgreen%h%Creset %an - %s' --graph
	lg = log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit
	lgnoauthor = log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr)' --abbrev-commit
	lost-commits = !git log --graph --decorate --pretty=oneline --abbrev-commit --all $(git fsck --no-reflogs | grep commit | cut -d\\  -f3)
	work = !git lg --author rcmachado --before today --after \"3 days ago\" --no-merges

	br = branch --all
	cp = cherry-pick
	st = status --short --branch
	root = !cd $(git rev-parse --show-toplevel)
	todo = grep --heading --break --ignore-case --regexp='\bTODO:'
	fix = grep --heading --break --ignore-case --regexp='\bFIX:' --regexp='\bFIXME:'
	fix-author = commit --amend --reset-author --no-edit
	conflicts = !git ls-files -u | cut -f 2 | sort -u

	bl = blame -w -M -C -c

	ignore = update-index --assume-unchanged
	unignore = update-index --no-assume-unchanged
	ignored = !git ls-files -v | grep '^[a-z]'

	# hub commands
	pr = pull-request

# URL shorthands

[url "git@github.com:"]
	insteadOf = "gh:"
	pushInsteadOf = "github:"
	pushInsteadOf = "git://github.com/"

[url "git://github.com/"]
	insteadOf = "github:"

[url "git@gist.github.com:"]
	insteadOf = "gst:"
	pushInsteadOf = "gist:"
	pushInsteadOf = "git://gist.github.com/"

[url "git://gist.github.com/"]
	insteadOf = "gist:"

[include]
	; Private config settings for user
	; Don't ever commit this file
	path = ~/.private-gitconfig
[rebase]
	autosquash = true
	autoStash = true
[web]
	browser = open
[hub]
	protocol = ssh